1 files changed, 10 insertions, 100 deletions

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index d8e622dd738a..0a7ed5b5e281 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -2643,68 +2643,13 @@ static void print_lat_fmt(void *data, int size __unused)
                 printf(".");
 
         if (lock_depth < 0)
-                printf(".");
+                printf(". ");
         else
-                printf("%d", lock_depth);
+                printf("%d ", lock_depth);
 }
 
-/* taken from Linux, written by Frederic Weisbecker */
-static void print_graph_cpu(int cpu)
-{
-        int i;
-        int log10_this = log10_cpu(cpu);
-        int log10_all = log10_cpu(cpus);
-
-
-        /*
-         * Start with a space character - to make it stand out
-         * to the right a bit when trace output is pasted into
-         * email:
-         */
-        printf(" ");
-
-        /*
-         * Tricky - we space the CPU field according to the max
-         * number of online CPUs. On a 2-cpu system it would take
-         * a maximum of 1 digit - on a 128 cpu system it would
-         * take up to 3 digits:
-         */
-        for (i = 0; i < log10_all - log10_this; i++)
-                printf(" ");
-
-        printf("%d) ", cpu);
-}
-
-#define TRACE_GRAPH_PROCINFO_LENGTH     14
 #define TRACE_GRAPH_INDENT      2
 
-static void print_graph_proc(int pid, const char *comm)
-{
-        /* sign + log10(MAX_INT) + '\0' */
-        char pid_str[11];
-        int spaces = 0;
-        int len;
-        int i;
-
-        sprintf(pid_str, "%d", pid);
-
-        /* 1 stands for the "-" character */
-        len = strlen(comm) + strlen(pid_str) + 1;
-
-        if (len < TRACE_GRAPH_PROCINFO_LENGTH)
-                spaces = TRACE_GRAPH_PROCINFO_LENGTH - len;
-
-        /* First spaces to align center */
-        for (i = 0; i < spaces / 2; i++)
-                printf(" ");
-
-        printf("%s-%s", comm, pid_str);
-
-        /* Last spaces to align center */
-        for (i = 0; i < spaces - (spaces / 2); i++)
-                printf(" ");
-}
-
 static struct record *
 get_return_for_leaf(int cpu, int cur_pid, unsigned long long cur_func,
                     struct record *next)
@@ -2876,21 +2821,13 @@ static void print_graph_nested(struct event *event, void *data)
 
 static void
 pretty_print_func_ent(void *data, int size, struct event *event,
-                      int cpu, int pid, const char *comm,
-                      unsigned long secs, unsigned long usecs)
+                      int cpu, int pid)
 {
         struct format_field *field;
         struct record *rec;
         void *copy_data;
         unsigned long val;
 
-        printf("%5lu.%06lu |  ", secs, usecs);
-
-        print_graph_cpu(cpu);
-        print_graph_proc(pid, comm);
-
-        printf(" | ");
-
         if (latency_format) {
                 print_lat_fmt(data, size);
                 printf(" | ");
@@ -2923,22 +2860,13 @@ out_free:
 }
 
 static void
-pretty_print_func_ret(void *data, int size __unused, struct event *event,
-                      int cpu, int pid, const char *comm,
-                      unsigned long secs, unsigned long usecs)
+pretty_print_func_ret(void *data, int size __unused, struct event *event)
 {
         unsigned long long rettime, calltime;
         unsigned long long duration, depth;
         struct format_field *field;
         int i;
 
-        printf("%5lu.%06lu |  ", secs, usecs);
-
-        print_graph_cpu(cpu);
-        print_graph_proc(pid, comm);
-
-        printf(" | ");
-
         if (latency_format) {
                 print_lat_fmt(data, size);
                 printf(" | ");
@@ -2976,31 +2904,21 @@ pretty_print_func_ret(void *data, int size __unused, struct event *event,
 
 static void
 pretty_print_func_graph(void *data, int size, struct event *event,
-                        int cpu, int pid, const char *comm,
-                        unsigned long secs, unsigned long usecs)
+                        int cpu, int pid)
 {
         if (event->flags & EVENT_FL_ISFUNCENT)
-                pretty_print_func_ent(data, size, event,
-                                      cpu, pid, comm, secs, usecs);
+                pretty_print_func_ent(data, size, event, cpu, pid);
         else if (event->flags & EVENT_FL_ISFUNCRET)
-                pretty_print_func_ret(data, size, event,
-                                      cpu, pid, comm, secs, usecs);
+                pretty_print_func_ret(data, size, event);
         printf("\n");
 }
 
-void print_event(int cpu, void *data, int size, unsigned long long nsecs,
-                  char *comm)
+void print_trace_event(int cpu, void *data, int size)
 {
         struct event *event;
-        unsigned long secs;
-        unsigned long usecs;
         int type;
         int pid;
 
-        secs = nsecs / NSECS_PER_SEC;
-        nsecs -= secs * NSECS_PER_SEC;
-        usecs = nsecs / NSECS_PER_USEC;
-
         type = trace_parse_common_type(data);
 
         event = trace_find_event(type);
@@ -3012,17 +2930,10 @@ void print_event(int cpu, void *data, int size, unsigned long long nsecs,
         pid = trace_parse_common_pid(data);
 
         if (event->flags & (EVENT_FL_ISFUNCENT | EVENT_FL_ISFUNCRET))
-                return pretty_print_func_graph(data, size, event, cpu,
-                                               pid, comm, secs, usecs);
+                return pretty_print_func_graph(data, size, event, cpu, pid);
 
-        if (latency_format) {
-                printf("%8.8s-%-5d %3d",
-                       comm, pid, cpu);
+        if (latency_format)
                 print_lat_fmt(data, size);
-        } else
-                printf("%16s-%-5d [%03d]", comm, pid,  cpu);
-
-        printf(" %5lu.%06lu: %s: ", secs, usecs, event->name);
 
         if (event->flags & EVENT_FL_FAILED) {
                 printf("EVENT '%s' FAILED TO PARSE\n",
@@ -3031,7 +2942,6 @@ void print_event(int cpu, void *data, int size, unsigned long long nsecs,
         }
 
         pretty_print(data, size, event);
-        printf("\n");
 }
 
 static void print_fields(struct print_flag_sym *field)