Skip to content

Commit

Permalink
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux…
Browse files Browse the repository at this point in the history 
…/kernel/git/jolsa/perf into perf/core

Pull perf/core improvements and fixes from Jiri Olsa:

Infrastructure changes:

  * Making some code (cpu node map and report parse callchain callback) global
    to be usable by upcomming changes (Don Zickus)

  * Fix pmu object compilation error (Jiri Olsa)

Signed-off-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Ingo Molnar committed Apr 22, 2014
2 parents 4a3dc12 + cff6bb4 commit a81fef3
Show file tree
Hide file tree
Showing 7 changed files with 283 additions and 156 deletions.
78 changes: 3 additions & 75 deletions tools/perf/builtin-kmem.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "util/parse-options.h"
#include "util/trace-event.h"
#include "util/data.h"
#include "util/cpumap.h"

#include "util/debug.h"

Expand All @@ -31,9 +32,6 @@ static int caller_lines = -1;

static bool raw_ip;

static int *cpunode_map;
static int max_cpu_num;

struct alloc_stat {
u64 call_site;
u64 ptr;
Expand All @@ -55,76 +53,6 @@ static struct rb_root root_caller_sorted;
static unsigned long total_requested, total_allocated;
static unsigned long nr_allocs, nr_cross_allocs;

#define PATH_SYS_NODE "/sys/devices/system/node"

static int init_cpunode_map(void)
{
FILE *fp;
int i, err = -1;

fp = fopen("/sys/devices/system/cpu/kernel_max", "r");
if (!fp) {
max_cpu_num = 4096;
return 0;
}

if (fscanf(fp, "%d", &max_cpu_num) < 1) {
pr_err("Failed to read 'kernel_max' from sysfs");
goto out_close;
}

max_cpu_num++;

cpunode_map = calloc(max_cpu_num, sizeof(int));
if (!cpunode_map) {
pr_err("%s: calloc failed\n", __func__);
goto out_close;
}

for (i = 0; i < max_cpu_num; i++)
cpunode_map[i] = -1;

err = 0;
out_close:
fclose(fp);
return err;
}

static int setup_cpunode_map(void)
{
struct dirent *dent1, *dent2;
DIR *dir1, *dir2;
unsigned int cpu, mem;
char buf[PATH_MAX];

if (init_cpunode_map())
return -1;

dir1 = opendir(PATH_SYS_NODE);
if (!dir1)
return 0;

while ((dent1 = readdir(dir1)) != NULL) {
if (dent1->d_type != DT_DIR ||
sscanf(dent1->d_name, "node%u", &mem) < 1)
continue;

snprintf(buf, PATH_MAX, "%s/%s", PATH_SYS_NODE, dent1->d_name);
dir2 = opendir(buf);
if (!dir2)
continue;
while ((dent2 = readdir(dir2)) != NULL) {
if (dent2->d_type != DT_LNK ||
sscanf(dent2->d_name, "cpu%u", &cpu) < 1)
continue;
cpunode_map[cpu] = mem;
}
closedir(dir2);
}
closedir(dir1);
return 0;
}

static int insert_alloc_stat(unsigned long call_site, unsigned long ptr,
int bytes_req, int bytes_alloc, int cpu)
{
Expand Down Expand Up @@ -235,7 +163,7 @@ static int perf_evsel__process_alloc_node_event(struct perf_evsel *evsel,
int ret = perf_evsel__process_alloc_event(evsel, sample);

if (!ret) {
int node1 = cpunode_map[sample->cpu],
int node1 = cpu__get_node(sample->cpu),
node2 = perf_evsel__intval(evsel, sample, "node");

if (node1 != node2)
Expand Down Expand Up @@ -772,7 +700,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused)
if (!strncmp(argv[0], "rec", 3)) {
return __cmd_record(argc, argv);
} else if (!strcmp(argv[0], "stat")) {
if (setup_cpunode_map())
if (cpu__setup_cpunode_map())
return -1;

if (list_empty(&caller_sort))
Expand Down
81 changes: 3 additions & 78 deletions tools/perf/builtin-report.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -589,11 +589,9 @@ static int __cmd_report(struct report *rep)
}

static int
parse_callchain_opt(const struct option *opt, const char *arg, int unset)
report_parse_callchain_opt(const struct option *opt, const char *arg, int unset)
{
struct report *rep = (struct report *)opt->value;
char *tok, *tok2;
char *endptr;

/*
* --no-call-graph
Expand All @@ -603,80 +601,7 @@ parse_callchain_opt(const struct option *opt, const char *arg, int unset)
return 0;
}

symbol_conf.use_callchain = true;

if (!arg)
return 0;

tok = strtok((char *)arg, ",");
if (!tok)
return -1;

/* get the output mode */
if (!strncmp(tok, "graph", strlen(arg)))
callchain_param.mode = CHAIN_GRAPH_ABS;

else if (!strncmp(tok, "flat", strlen(arg)))
callchain_param.mode = CHAIN_FLAT;

else if (!strncmp(tok, "fractal", strlen(arg)))
callchain_param.mode = CHAIN_GRAPH_REL;

else if (!strncmp(tok, "none", strlen(arg))) {
callchain_param.mode = CHAIN_NONE;
symbol_conf.use_callchain = false;

return 0;
}

else
return -1;

/* get the min percentage */
tok = strtok(NULL, ",");
if (!tok)
goto setup;

callchain_param.min_percent = strtod(tok, &endptr);
if (tok == endptr)
return -1;

/* get the print limit */
tok2 = strtok(NULL, ",");
if (!tok2)
goto setup;

if (tok2[0] != 'c') {
callchain_param.print_limit = strtoul(tok2, &endptr, 0);
tok2 = strtok(NULL, ",");
if (!tok2)
goto setup;
}

/* get the call chain order */
if (!strncmp(tok2, "caller", strlen("caller")))
callchain_param.order = ORDER_CALLER;
else if (!strncmp(tok2, "callee", strlen("callee")))
callchain_param.order = ORDER_CALLEE;
else
return -1;

/* Get the sort key */
tok2 = strtok(NULL, ",");
if (!tok2)
goto setup;
if (!strncmp(tok2, "function", strlen("function")))
callchain_param.key = CCKEY_FUNCTION;
else if (!strncmp(tok2, "address", strlen("address")))
callchain_param.key = CCKEY_ADDRESS;
else
return -1;
setup:
if (callchain_register_param(&callchain_param) < 0) {
pr_err("Can't register callchain params\n");
return -1;
}
return 0;
return parse_callchain_report_opt(arg);
}

int
Expand Down Expand Up @@ -788,7 +713,7 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
"Only display entries with parent-match"),
OPT_CALLBACK_DEFAULT('g', "call-graph", &report, "output_type,min_percent[,print_limit],call_order",
"Display callchains using output_type (graph, flat, fractal, or none) , min percent threshold, optional print limit, callchain order, key (function or address). "
"Default: fractal,0.5,callee,function", &parse_callchain_opt, callchain_default_opt),
"Default: fractal,0.5,callee,function", &report_parse_callchain_opt, callchain_default_opt),
OPT_INTEGER(0, "max-stack", &report.max_stack,
"Set the maximum stack depth when parsing the callchain, "
"anything beyond the specified depth will be ignored. "
Expand Down
78 changes: 78 additions & 0 deletions tools/perf/util/callchain.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,84 @@

__thread struct callchain_cursor callchain_cursor;

int
parse_callchain_report_opt(const char *arg)
{
char *tok, *tok2;
char *endptr;

symbol_conf.use_callchain = true;

if (!arg)
return 0;

tok = strtok((char *)arg, ",");
if (!tok)
return -1;

/* get the output mode */
if (!strncmp(tok, "graph", strlen(arg))) {
callchain_param.mode = CHAIN_GRAPH_ABS;

} else if (!strncmp(tok, "flat", strlen(arg))) {
callchain_param.mode = CHAIN_FLAT;
} else if (!strncmp(tok, "fractal", strlen(arg))) {
callchain_param.mode = CHAIN_GRAPH_REL;
} else if (!strncmp(tok, "none", strlen(arg))) {
callchain_param.mode = CHAIN_NONE;
symbol_conf.use_callchain = false;
return 0;
} else {
return -1;
}

/* get the min percentage */
tok = strtok(NULL, ",");
if (!tok)
goto setup;

callchain_param.min_percent = strtod(tok, &endptr);
if (tok == endptr)
return -1;

/* get the print limit */
tok2 = strtok(NULL, ",");
if (!tok2)
goto setup;

if (tok2[0] != 'c') {
callchain_param.print_limit = strtoul(tok2, &endptr, 0);
tok2 = strtok(NULL, ",");
if (!tok2)
goto setup;
}

/* get the call chain order */
if (!strncmp(tok2, "caller", strlen("caller")))
callchain_param.order = ORDER_CALLER;
else if (!strncmp(tok2, "callee", strlen("callee")))
callchain_param.order = ORDER_CALLEE;
else
return -1;

/* Get the sort key */
tok2 = strtok(NULL, ",");
if (!tok2)
goto setup;
if (!strncmp(tok2, "function", strlen("function")))
callchain_param.key = CCKEY_FUNCTION;
else if (!strncmp(tok2, "address", strlen("address")))
callchain_param.key = CCKEY_ADDRESS;
else
return -1;
setup:
if (callchain_register_param(&callchain_param) < 0) {
pr_err("Can't register callchain params\n");
return -1;
}
return 0;
}

static void
rb_insert_callchain(struct rb_root *root, struct callchain_node *chain,
enum chain_mode mode)
Expand Down
1 change: 1 addition & 0 deletions tools/perf/util/callchain.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,4 +157,5 @@ int sample__resolve_callchain(struct perf_sample *sample, struct symbol **parent
int hist_entry__append_callchain(struct hist_entry *he, struct perf_sample *sample);

extern const char record_callchain_help[];
int parse_callchain_report_opt(const char *arg);
#endif /* __PERF_CALLCHAIN_H */
Loading

0 comments on commit a81fef3

Please sign in to comment.