perf evsel: Remove symbol_conf usage

  # perf test -v python
  16: Try 'import perf' in python, checking link problems      :
  --- start ---
  test child forked, pid 672
  Traceback (most recent call last):
    File "<stdin>", line 1, in <module>
  ImportError: /tmp/build/perf/python/perf.so: undefined symbol:
  symbol_conf
  test child finished with -1
  ---- end ----
  Try 'import perf' in python, checking link problems: FAILED!
  #

To fix it just pass a parameter to perf_evsel__fprintf_sym telling if
callchains should be printed.

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-comrsr20bsnr8bg0n6rfwv12@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 838c0bc38105fa5d188b6326749d48fda72a58b2..717ba021523406f6138441d3790c41bd25f2689a 100644 (file)
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -580,6 +580,7 @@ static void print_sample_bts(struct perf_sample *sample,
                        }
                }
                perf_evsel__fprintf_sym(evsel, sample, al, 0, print_opts,
+                                       symbol_conf.use_callchain,
                                        scripting_max_stack, stdout);
        }
 
@@ -790,6 +791,7 @@ static void process_event(struct perf_script *script,
 
                perf_evsel__fprintf_sym(evsel, sample, al, 0,
                                        output[attr->type].print_ip_opts,
+                                       symbol_conf.use_callchain,
                                        scripting_max_stack, stdout);
        }
 

diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 38f464a4fa04fb436fcd44493b832be97b42d21d..60bba67e6959ee8225b70b49a9b15d3b1192de49 100644 (file)
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -2430,8 +2430,8 @@ next:
 
 int perf_evsel__fprintf_sym(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)
+                           unsigned int print_opts, bool print_callchain,
+                           unsigned int stack_depth, FILE *fp)
 {
        int printed = 0;
        int print_ip = print_opts & EVSEL__PRINT_IP;
@@ -2441,7 +2441,7 @@ 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 (symbol_conf.use_callchain && sample->callchain) {
+       if (print_callchain && sample->callchain) {
                printed += perf_evsel__fprintf_callchain(evsel, sample, al, left_alignment,
                                                         print_opts, stack_depth, fp);
        } else if (!(al->sym && al->sym->ignore)) {

diff --git a/tools/perf/util/evsel.h b/tools/perf/util/evsel.h
index 36edd3c91d5c02104f312023968e2ebe13cb595f..013f3615730bd74d46249a38e79a451cab8d676e 100644 (file)
--- a/tools/perf/util/evsel.h
+++ b/tools/perf/util/evsel.h
@@ -403,8 +403,8 @@ int perf_evsel__fprintf_callchain(struct perf_evsel *evsel,
 
 int perf_evsel__fprintf_sym(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);
+                           unsigned int print_opts, bool print_callchain,
+                           unsigned int stack_depth, FILE *fp);
 
 bool perf_evsel__fallback(struct perf_evsel *evsel, int err,
                          char *msg, size_t msgsize);