xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

perf script: Move evname print code to process_event()

Browse Source 
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: Namhyung Kim <namhyung@kernel.org>
Reviewed-by: David 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: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
Namhyung Kim
2013-11-18 14:34:52 +09:00
committed by Arnaldo Carvalho de Melo
parent a8b4c7014c
commit e944d3d7d1
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/perf/builtin-script.c
View File

@@ -288,7 +288,6 @@ static void print_sample_start(struct perf_sample *sample,
struct perf_evsel *evsel) struct perf_evsel *evsel)
{ {
struct perf_event_attr *attr = &evsel->attr; struct perf_event_attr *attr = &evsel->attr;
const char *evname = NULL;
unsigned long secs; unsigned long secs;
unsigned long usecs; unsigned long usecs;
unsigned long long nsecs; unsigned long long nsecs;
@@ -323,11 +322,6 @@ static void print_sample_start(struct perf_sample *sample,
usecs = nsecs / NSECS_PER_USEC; usecs = nsecs / NSECS_PER_USEC;
printf("%5lu.%06lu: ", secs, usecs); 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) 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); 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)) { if (is_bts_event(attr)) {
print_sample_bts(event, sample, evsel, machine, thread); print_sample_bts(event, sample, evsel, machine, thread);
return; return;