Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit de446b40 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 91d7b2de

tools/perf/builtin-script.c

+2 −0
Original line number Diff line number Diff line
@@ -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);

	}

tools/perf/util/evsel.c

+3 −3
Original line number Diff line number Diff line
@@ -2430,8 +2430,8 @@ int perf_evsel__fprintf_callchain(struct perf_evsel *evsel, struct perf_sample * 


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)) {

tools/perf/util/evsel.h

+2 −2
Original line number Diff line number Diff line
@@ -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);