perf evsel: Require that callchains be resolved before calling fprintf_{sym,callchain}

This way the print routine merely does printing, not requiring access to
the resolving machinery, which helps disentangling the object files and
easing creating subsets with a limited functionality set.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-2ti2jbra8fypdfawwwm3aee3@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index 717ba021523406f6138441d3790c41bd25f2689a..875d84e7ba5ba27bc263a61473f2d3142b5794f7 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -569,19 +569,23 @@ static void print_sample_bts(struct perf_sample *sample,
        /* print branch_from information */
        if (PRINT_FIELD(IP)) {
                unsigned int print_opts = output[attr->type].print_ip_opts;
+               struct callchain_cursor *cursor = NULL, cursor_callchain;
 
-               if (symbol_conf.use_callchain && sample->callchain) {
-                       printf("\n");
-               } else {
-                       printf(" ");
+               if (symbol_conf.use_callchain && sample->callchain &&
+                   thread__resolve_callchain(al->thread, &cursor_callchain, evsel,
+                                             sample, NULL, NULL, scripting_max_stack) == 0)
+                       cursor = &cursor_callchain;
+
+               if (cursor == NULL) {
+                       putchar(' ');
                        if (print_opts & EVSEL__PRINT_SRCLINE) {
                                print_srcline_last = true;
                                print_opts &= ~EVSEL__PRINT_SRCLINE;
                        }
-               }
-               perf_evsel__fprintf_sym(evsel, sample, al, 0, print_opts,
-                                       symbol_conf.use_callchain,
-                                       scripting_max_stack, stdout);
+               } else
+                       putchar('\n');
+
+               sample__fprintf_sym(sample, al, 0, print_opts, cursor, stdout);
        }
 
        /* print branch_to information */
@@ -784,15 +788,15 @@ static void process_event(struct perf_script *script,
                printf("%16" PRIu64, sample->weight);
 
        if (PRINT_FIELD(IP)) {
-               if (!symbol_conf.use_callchain)
-                       printf(" ");
-               else
-                       printf("\n");
+               struct callchain_cursor *cursor = NULL, cursor_callchain;
+
+               if (symbol_conf.use_callchain &&
+                   thread__resolve_callchain(al->thread, &cursor_callchain, evsel,
+                                             sample, NULL, NULL, scripting_max_stack) == 0)
+                       cursor = &cursor_callchain;
 
-               perf_evsel__fprintf_sym(evsel, sample, al, 0,
-                                       output[attr->type].print_ip_opts,
-                                       symbol_conf.use_callchain,
-                                       scripting_max_stack, stdout);
+               putchar(cursor ? '\n' : ' ');
+               sample__fprintf_sym(sample, al, 0, output[attr->type].print_ip_opts, cursor, stdout);
        }
 
        if (PRINT_FIELD(IREGS))

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index e5f0cc16bb93378b89eb0cceade5d053be37f6a2..0e2a82bda22f82abe515de48f050cbab0d63eadd 100644 (file)
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -1890,14 +1890,16 @@ static int trace__fprintf_callchain(struct trace *trace, struct perf_evsel *evse
        if (sample->callchain == NULL)
                return 0;
 
-       if (machine__resolve(trace->host, &al, sample) < 0) {
+       if (machine__resolve(trace->host, &al, sample) < 0 ||
+           thread__resolve_callchain(al.thread, &callchain_cursor, evsel,
+                                     sample, NULL, NULL, scripting_max_stack)) {
                pr_err("Problem processing %s callchain, skipping...\n",
                        perf_evsel__name(evsel));
                return 0;
        }
 
-       return perf_evsel__fprintf_callchain(evsel, sample, &al, 38, print_opts,
-                                            scripting_max_stack, trace->output);
+       return sample__fprintf_callchain(sample, &al, 38, print_opts,
+                                        &callchain_cursor, trace->output);
 }
 
 static int trace__sys_exit(struct trace *trace, struct perf_evsel *evsel,

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 60bba67e6959ee8225b70b49a9b15d3b1192de49..35c5a5282239697ce2392524f1a238ad34d72656 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2343,13 +2343,12 @@ out:
        return ++printed;
 }
 
-int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample *sample,
-                                 struct addr_location *al, int left_alignment,
-                                 unsigned int print_opts, unsigned int stack_depth,
-                                 FILE *fp)
+int sample__fprintf_callchain(struct perf_sample *sample,
+                             struct addr_location *al, int left_alignment,
+                             unsigned int print_opts, struct callchain_cursor *cursor,
+                             FILE *fp)
 {
        int printed = 0;
-       struct callchain_cursor cursor;
        struct callchain_cursor_node *node;
        int print_ip = print_opts & EVSEL__PRINT_IP;
        int print_sym = print_opts & EVSEL__PRINT_SYM;
@@ -2363,22 +2362,15 @@ int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample *
        if (sample->callchain) {
                struct addr_location node_al;
 
-               if (thread__resolve_callchain(al->thread, &cursor, evsel,
-                                             sample, NULL, NULL,
-                                             stack_depth) != 0) {
-                       if (verbose)
-                               error("Failed to resolve callchain. Skipping\n");
-                       return printed;
-               }
-               callchain_cursor_commit(&cursor);
+               callchain_cursor_commit(cursor);
 
                if (print_symoffset)
                        node_al = *al;
 
-               while (stack_depth) {
+               while (1) {
                        u64 addr = 0;
 
-                       node = callchain_cursor_current(&cursor);
+                       node = callchain_cursor_current(cursor);
                        if (!node)
                                break;
 
@@ -2418,20 +2410,17 @@ int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample *
 
                        if (!print_oneline)
                                printed += fprintf(fp, "\n");
-
-                       stack_depth--;
 next:
-                       callchain_cursor_advance(&cursor);
+                       callchain_cursor_advance(cursor);
                }
        }
 
        return printed;
 }
 
-int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample,
-                           struct addr_location *al, int left_alignment,
-                           unsigned int print_opts, bool print_callchain,
-                           unsigned int stack_depth, FILE *fp)
+int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,
+                       int left_alignment, unsigned int print_opts,
+                       struct callchain_cursor *cursor, FILE *fp)
 {
        int printed = 0;
        int print_ip = print_opts & EVSEL__PRINT_IP;
@@ -2441,9 +2430,9 @@ int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample
        int print_srcline = print_opts & EVSEL__PRINT_SRCLINE;
        int print_unknown_as_addr = print_opts & EVSEL__PRINT_UNKNOWN_AS_ADDR;
 
-       if (print_callchain && sample->callchain) {
-               printed += perf_evsel__fprintf_callchain(evsel, sample, al, left_alignment,
-                                                        print_opts, stack_depth, fp);
+       if (cursor != NULL) {
+               printed += sample__fprintf_callchain(sample, al, left_alignment,
+                                                    print_opts, cursor, fp);
        } else if (!(al->sym && al->sym->ignore)) {
                printed += fprintf(fp, "%-*.*s", left_alignment, left_alignment, " ");
 

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 013f3615730bd74d46249a38e79a451cab8d676e..abadfea1dbaa90449d60c98a8f5f029fd1dd67eb 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -395,16 +395,15 @@ int perf_evsel__fprintf(struct perf_evsel *evsel,
 #define EVSEL__PRINT_SRCLINE           (1<<5)
 #define EVSEL__PRINT_UNKNOWN_AS_ADDR   (1<<6)
 
-int perf_evsel__fprintf_callchain(struct perf_evsel *evsel,
-                                 struct perf_sample *sample,
-                                 struct addr_location *al, int left_alignment,
-                                 unsigned int print_opts,
-                                 unsigned int stack_depth, FILE *fp);
-
-int perf_evsel__fprintf_sym(struct perf_evsel *evsel, struct perf_sample *sample,
-                           struct addr_location *al, int left_alignment,
-                           unsigned int print_opts, bool print_callchain,
-                           unsigned int stack_depth, FILE *fp);
+struct callchain_cursor;
+
+int sample__fprintf_callchain(struct perf_sample *sample, struct addr_location *al,
+                             int left_alignment, unsigned int print_opts,
+                             struct callchain_cursor *cursor, FILE *fp);
+
+int sample__fprintf_sym(struct perf_sample *sample, struct addr_location *al,
+                       int left_alignment, unsigned int print_opts,
+                       struct callchain_cursor *cursor, FILE *fp);
 
 bool perf_evsel__fallback(struct perf_evsel *evsel, int err,
                          char *msg, size_t msgsize);