aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/builtin-script.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/tools/perf/builtin-script.c b/tools/perf/builtin-script.c
index baf17989a216..b392770766dd 100644
--- a/tools/perf/builtin-script.c
+++ b/tools/perf/builtin-script.c
@@ -288,7 +288,6 @@ static void print_sample_start(struct perf_sample *sample,
288 struct perf_evsel *evsel) 288 struct perf_evsel *evsel)
289{ 289{
290 struct perf_event_attr *attr = &evsel->attr; 290 struct perf_event_attr *attr = &evsel->attr;
291 const char *evname = NULL;
292 unsigned long secs; 291 unsigned long secs;
293 unsigned long usecs; 292 unsigned long usecs;
294 unsigned long long nsecs; 293 unsigned long long nsecs;
@@ -323,11 +322,6 @@ static void print_sample_start(struct perf_sample *sample,
323 usecs = nsecs / NSECS_PER_USEC; 322 usecs = nsecs / NSECS_PER_USEC;
324 printf("%5lu.%06lu: ", secs, usecs); 323 printf("%5lu.%06lu: ", secs, usecs);
325 } 324 }
326
327 if (PRINT_FIELD(EVNAME)) {
328 evname = perf_evsel__name(evsel);
329 printf("%s: ", evname ? evname : "[unknown]");
330 }
331} 325}
332 326
333static bool is_bts_event(struct perf_event_attr *attr) 327static 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,
434 428
435 print_sample_start(sample, thread, evsel); 429 print_sample_start(sample, thread, evsel);
436 430
431 if (PRINT_FIELD(EVNAME)) {
432 const char *evname = perf_evsel__name(evsel);
433 printf("%s: ", evname ? evname : "[unknown]");
434 }
435
437 if (is_bts_event(attr)) { 436 if (is_bts_event(attr)) {
438 print_sample_bts(event, sample, evsel, machine, thread); 437 print_sample_bts(event, sample, evsel, machine, thread);
439 return; 438 return;