mirror of
git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
synced 2025-09-04 20:19:47 +08:00
4fd113b5ce
There's a bug that perf report sometimes ignore some options on --stdio
output. This bug is triggered only if a related config variable is set.
For example, let's assume we have a following config file.
$ cat ~/.perfconfig
[call-graph]
print-type = graph
[hist]
percentage = absolute
Then, following perf config will not honor some options.
$ perf record -ag sleep 1
[ perf record: Woken up 1 times to write data ]
[ perf record: Captured and wrote 0.199 MB perf.data (77 samples) ]
$ perf report -g none --stdio
# To display the perf.data header info, please use --header/--header-only options.
#
# Samples: 77 of event 'cycles'
# Event count (approx.): 25425383
#
# Overhead Command Shared Object Symbol
# ........ ............... ....................... ..............
#
16.34% swapper [kernel.vmlinux] [k] intel_idle
|
---intel_idle
cpuidle_enter_state
cpuidle_enter
cpu_startup_entry
...
With '-g none' option, it should not show callchains, but it still shows
callchains. However it works as expected on --tui output.
Similarly, '--percentage relative' option is not work and still shows a
absolute percentage values.
Looking at the source, I found that those setting were overwritten by
config variables when setup_pager() called. The setup_pager() is to
start a pager process so that it can manage long lines of output on the
stdio mode. But as it calls the perf_config() after parsing arguments,
the settings were overwritten regardless of command line options.
The reason it calls perf_config() is to find the 'pager_program' which
might be set by a config variable, I guess. However current perf code
does not provide the config variable for it, so it's just meaningless
IMHO. Eliminating the call makes the option working as expected.
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Taeung Song <treeze.taeung@gmail.com>
Link: http://lkml.kernel.org/r/1431529406-6762-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
80 lines
2.4 KiB
C
80 lines
2.4 KiB
C
#ifndef __PERF_CACHE_H
|
|
#define __PERF_CACHE_H
|
|
|
|
#include <stdbool.h>
|
|
#include "util.h"
|
|
#include "strbuf.h"
|
|
#include "../perf.h"
|
|
#include "../ui/ui.h"
|
|
|
|
#define CMD_EXEC_PATH "--exec-path"
|
|
#define CMD_PERF_DIR "--perf-dir="
|
|
#define CMD_WORK_TREE "--work-tree="
|
|
#define CMD_DEBUGFS_DIR "--debugfs-dir="
|
|
|
|
#define PERF_DIR_ENVIRONMENT "PERF_DIR"
|
|
#define PERF_WORK_TREE_ENVIRONMENT "PERF_WORK_TREE"
|
|
#define EXEC_PATH_ENVIRONMENT "PERF_EXEC_PATH"
|
|
#define DEFAULT_PERF_DIR_ENVIRONMENT ".perf"
|
|
#define PERF_DEBUGFS_ENVIRONMENT "PERF_DEBUGFS_DIR"
|
|
#define PERF_TRACEFS_ENVIRONMENT "PERF_TRACEFS_DIR"
|
|
|
|
typedef int (*config_fn_t)(const char *, const char *, void *);
|
|
extern int perf_default_config(const char *, const char *, void *);
|
|
extern int perf_config(config_fn_t fn, void *);
|
|
extern int perf_config_int(const char *, const char *);
|
|
extern u64 perf_config_u64(const char *, const char *);
|
|
extern int perf_config_bool(const char *, const char *);
|
|
extern int config_error_nonbool(const char *);
|
|
extern const char *perf_config_dirname(const char *, const char *);
|
|
|
|
/* pager.c */
|
|
extern void setup_pager(void);
|
|
extern int pager_in_use(void);
|
|
extern int pager_use_color;
|
|
|
|
char *alias_lookup(const char *alias);
|
|
int split_cmdline(char *cmdline, const char ***argv);
|
|
|
|
#define alloc_nr(x) (((x)+16)*3/2)
|
|
|
|
/*
|
|
* Realloc the buffer pointed at by variable 'x' so that it can hold
|
|
* at least 'nr' entries; the number of entries currently allocated
|
|
* is 'alloc', using the standard growing factor alloc_nr() macro.
|
|
*
|
|
* DO NOT USE any expression with side-effect for 'x' or 'alloc'.
|
|
*/
|
|
#define ALLOC_GROW(x, nr, alloc) \
|
|
do { \
|
|
if ((nr) > alloc) { \
|
|
if (alloc_nr(alloc) < (nr)) \
|
|
alloc = (nr); \
|
|
else \
|
|
alloc = alloc_nr(alloc); \
|
|
x = xrealloc((x), alloc * sizeof(*(x))); \
|
|
} \
|
|
} while(0)
|
|
|
|
|
|
static inline int is_absolute_path(const char *path)
|
|
{
|
|
return path[0] == '/';
|
|
}
|
|
|
|
const char *make_nonrelative_path(const char *path);
|
|
char *strip_path_suffix(const char *path, const char *suffix);
|
|
|
|
extern char *mkpath(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
|
|
extern char *perf_path(const char *fmt, ...) __attribute__((format (printf, 1, 2)));
|
|
|
|
extern char *perf_pathdup(const char *fmt, ...)
|
|
__attribute__((format (printf, 1, 2)));
|
|
|
|
#ifndef __UCLIBC__
|
|
/* Matches the libc/libbsd function attribute so we declare this unconditionally: */
|
|
extern size_t strlcpy(char *dest, const char *src, size_t size);
|
|
#endif
|
|
|
|
#endif /* __PERF_CACHE_H */
|