summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tools/perf/builtin-sched.c17
-rw-r--r--tools/perf/util/trace-event-read.c6
2 files changed, 13 insertions, 10 deletions
diff --git a/tools/perf/builtin-sched.c b/tools/perf/builtin-sched.c
index 84699cf036a..a084c284e19 100644
--- a/tools/perf/builtin-sched.c
+++ b/tools/perf/builtin-sched.c
@@ -1096,14 +1096,15 @@ static void output_lat_thread(struct thread_latency *lat)
if (!count)
return;
- ret = printf("%s", lat->thread->comm);
+ ret = printf(" %s ", lat->thread->comm);
- for (i = 0; i < 25 - ret; i++)
+ for (i = 0; i < 19 - ret; i++)
printf(" ");
avg = total / count;
- printf("%5d %10llu %10llu %10llu\n", count, total, avg, max);
+ printf("|%9.3f ms |%9d | avg:%9.3f ms | max:%9.3f ms |\n",
+ 0.0, count, (double)avg/1e9, (double)max/1e9);
}
static void __cmd_lat(void)
@@ -1113,11 +1114,9 @@ static void __cmd_lat(void)
setup_pager();
read_events();
- printf(" Tasks");
- printf(" count");
- printf(" total");
- printf(" avg");
- printf(" max\n\n");
+ printf("-----------------------------------------------------------------------------------\n");
+ printf(" Task | runtime ms | switches | average delay ms | maximum delay ms |\n");
+ printf("-----------------------------------------------------------------------------------\n");
next = rb_first(&lat_snapshot_root);
@@ -1128,6 +1127,8 @@ static void __cmd_lat(void)
output_lat_thread(lat);
next = rb_next(next);
}
+
+ printf("-----------------------------------------------------------------------------------\n");
}
static struct trace_sched_handler *trace_handler;
diff --git a/tools/perf/util/trace-event-read.c b/tools/perf/util/trace-event-read.c
index a1217a10632..1b5c847d2c2 100644
--- a/tools/perf/util/trace-event-read.c
+++ b/tools/perf/util/trace-event-read.c
@@ -458,12 +458,13 @@ struct record *trace_read_data(int cpu)
return data;
}
-void trace_report (void)
+void trace_report(void)
{
const char *input_file = "trace.info";
char buf[BUFSIZ];
char test[] = { 23, 8, 68 };
char *version;
+ int show_version = 0;
int show_funcs = 0;
int show_printk = 0;
@@ -480,7 +481,8 @@ void trace_report (void)
die("not a trace file (missing tracing)");
version = read_string();
- printf("version = %s\n", version);
+ if (show_version)
+ printf("version = %s\n", version);
free(version);
read_or_die(buf, 1);