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

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

perf thread: Rename perf_event__preprocess_sample_addr to thread__resolve 

Since none of the perf_event fields are used anymore, just the
perf_sample ones, and since this resolves to (map, symbol) from data
structures within struct thread, rename it to thread__resolve and make
the argument ordering similar to the one in machine__resolve().

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Hemant Kumar <hemant@linux.vnet.ibm.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Naveen N. Rao <naveen.n.rao@linux.vnet.ibm.com>
Cc: Ravi Bangoria <ravi.bangoria@linux.vnet.ibm.com>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-2b33hs9bp550tezzlhl4kejh@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent bb3eb566

tools/perf/builtin-script.c

+2 −2
Original line number Diff line number Diff line
@@ -537,7 +537,7 @@ static void print_sample_brstacksym(union perf_event *event __maybe_unused, 
}





static void print_sample_addr(union perf_event *event,

static void print_sample_addr(union perf_event *event __maybe_unused,

			  struct perf_sample *sample,

			  struct thread *thread,

			  struct perf_event_attr *attr)
@@ -549,7 +549,7 @@ static void print_sample_addr(union perf_event *event, 
	if (!sample_addr_correlates_sym(attr))

		return;



	perf_event__preprocess_sample_addr(event, sample, thread, &al);

	thread__resolve(thread, &al, sample);



	if (PRINT_FIELD(SYM)) {

		printf(" ");

tools/perf/util/db-export.c

+1 −1
Original line number Diff line number Diff line
@@ -333,7 +333,7 @@ int db_export__sample(struct db_export *dbe, union perf_event *event, 
	    sample_addr_correlates_sym(&evsel->attr)) {

		struct addr_location addr_al;



		perf_event__preprocess_sample_addr(event, sample, thread, &addr_al);

		thread__resolve(thread, &addr_al, sample);

		err = db_ids_from_al(dbe, &addr_al, &es.addr_dso_db_id,

				     &es.addr_sym_db_id, &es.addr_offset);

		if (err)

tools/perf/util/event.c

+2 −4
Original line number Diff line number Diff line
@@ -1392,10 +1392,8 @@ bool sample_addr_correlates_sym(struct perf_event_attr *attr) 
	return false;

}



void perf_event__preprocess_sample_addr(union perf_event *event __maybe_unused,

					struct perf_sample *sample,

					struct thread *thread,

					struct addr_location *al)

void thread__resolve(struct thread *thread, struct addr_location *al,

		     struct perf_sample *sample)

{

	thread__find_addr_map(thread, sample->cpumode, MAP__FUNCTION, sample->addr, al);

	if (!al->map)

tools/perf/util/event.h

+2 −4
Original line number Diff line number Diff line
@@ -607,10 +607,8 @@ struct thread; 


bool is_bts_event(struct perf_event_attr *attr);

bool sample_addr_correlates_sym(struct perf_event_attr *attr);

void perf_event__preprocess_sample_addr(union perf_event *event,

					struct perf_sample *sample,

					struct thread *thread,

					struct addr_location *al);

void thread__resolve(struct thread *thread, struct addr_location *al,

		     struct perf_sample *sample);



const char *perf_event__name(unsigned int id);