1 files changed, 5 insertions, 35 deletions

diff --git a/tools/perf/builtin-trace.c b/tools/perf/builtin-trace.c
index 75972fd073df..a7750256c408 100644
--- a/tools/perf/builtin-trace.c
+++ b/tools/perf/builtin-trace.c
@@ -16,38 +16,10 @@
 
 static char             const *input_name = "perf.data";
 
-static unsigned long    total = 0;
-static unsigned long    total_comm = 0;
-
 static struct perf_header *header;
 static u64              sample_type;
 
-static char             *cwd;
-static int              cwdlen;
-
-
-static int
-process_comm_event(event_t *event, unsigned long offset, unsigned long head)
-{
-        struct thread *thread = threads__findnew(event->comm.pid);
-
-        dump_printf("%p [%p]: PERF_RECORD_COMM: %s:%d\n",
-                (void *)(offset + head),
-                (void *)(long)(event->header.size),
-                event->comm.comm, event->comm.pid);
-
-        if (thread == NULL ||
-            thread__set_comm(thread, event->comm.comm)) {
-                dump_printf("problem processing PERF_RECORD_COMM, skipping event.\n");
-                return -1;
-        }
-        total_comm++;
-
-        return 0;
-}
-
-static int
-process_sample_event(event_t *event, unsigned long offset, unsigned long head)
+static int process_sample_event(event_t *event)
 {
         u64 ip = event->ip.ip;
         u64 timestamp = -1;
@@ -72,9 +44,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
                 more_data += sizeof(u64);
         }
 
-        dump_printf("%p [%p]: PERF_RECORD_SAMPLE (IP, %d): %d/%d: %p period: %Ld\n",
-                (void *)(offset + head),
-                (void *)(long)(event->header.size),
+        dump_printf("(IP, %d): %d/%d: %p period: %Ld\n",
                 event->header.misc,
                 event->ip.pid, event->ip.tid,
                 (void *)(long)ip,
@@ -101,7 +71,7 @@ process_sample_event(event_t *event, unsigned long offset, unsigned long head)
                  */
                 print_event(cpu, raw->data, raw->size, timestamp, thread->comm);
         }
-        total += period;
+        event__stats.total += period;
 
         return 0;
 }
@@ -122,7 +92,7 @@ static int sample_type_check(u64 type)
 
 static struct perf_file_handler file_handler = {
         .process_sample_event   = process_sample_event,
-        .process_comm_event     = process_comm_event,
+        .process_comm_event     = event__process_comm,
         .sample_type_check      = sample_type_check,
 };
 
@@ -132,7 +102,7 @@ static int __cmd_trace(void)
         register_perf_file_handler(&file_handler);
 
         return mmap_dispatch_perf_file(&header, input_name,
-                                       0, 0, &cwdlen, &cwd);
+                                       0, 0, &event__cwdlen, &event__cwd);
 }
 
 static const char * const annotate_usage[] = {