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

Commit e944d3d7 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

perf script: Move evname print code to process_event() 



The print_sample_start() will be reused by other printing routine for
internal events like COMM, FORK and EXIT from next patch.  And because
they're not tied to a specific event, move the evname print code to its
caller.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarDavid Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1384752894-10974-1-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-script.c

+5 −6
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ static void print_sample_start(struct perf_sample *sample, 
			       struct perf_evsel *evsel)

{

	struct perf_event_attr *attr = &evsel->attr;

	const char *evname = NULL;

	unsigned long secs;

	unsigned long usecs;

	unsigned long long nsecs;
@@ -323,11 +322,6 @@ static void print_sample_start(struct perf_sample *sample, 
		usecs = nsecs / NSECS_PER_USEC;

		printf("%5lu.%06lu: ", secs, usecs);

	}



	if (PRINT_FIELD(EVNAME)) {

		evname = perf_evsel__name(evsel);

		printf("%s: ", evname ? evname : "[unknown]");

	}

}



static bool is_bts_event(struct perf_event_attr *attr)
@@ -434,6 +428,11 @@ static void process_event(union perf_event *event, struct perf_sample *sample, 


	print_sample_start(sample, thread, evsel);



	if (PRINT_FIELD(EVNAME)) {

		const char *evname = perf_evsel__name(evsel);

		printf("%s: ", evname ? evname : "[unknown]");

	}



	if (is_bts_event(attr)) {

		print_sample_bts(event, sample, evsel, machine, thread);

		return;