Skip to content

Commit

Permalink
Merge tag 'perf-urgent-for-mingo-20161222' of git://git.kernel.org/pu…
Browse files Browse the repository at this point in the history
…b/scm/linux/kernel/git/acme/linux into perf/urgent

Pull perf/urgent fixes from Arnaldo Carvalho de Melo:

Fixes for 'perf sched timehist': (Namhyung Kim)

 - Define a larger initial alignment value for the COMM column and
   make it be more consistently honoured, for instance in the header.

 - Fix invalid period calculation when using the --time option to
   select a time slice, when events outside that slice were being
   considered for the per cpu idle stats summary.

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>
  • Loading branch information
Ingo Molnar committed Dec 23, 2016
2 parents 1134c2b + bdd7572 commit 3705b97
Showing 1 changed file with 6 additions and 8 deletions.
14 changes: 6 additions & 8 deletions tools/perf/builtin-sched.c
Original file line number Diff line number Diff line change
Expand Up @@ -1775,7 +1775,7 @@ static u64 perf_evsel__get_time(struct perf_evsel *evsel, u32 cpu)
return r->last_time[cpu];
}

static int comm_width = 20;
static int comm_width = 30;

static char *timehist_get_commstr(struct thread *thread)
{
Expand Down Expand Up @@ -1817,7 +1817,7 @@ static void timehist_header(struct perf_sched *sched)
printf(" ");
}

printf(" %-20s %9s %9s %9s",
printf(" %-*s %9s %9s %9s", comm_width,
"task name", "wait time", "sch delay", "run time");

printf("\n");
Expand All @@ -1830,7 +1830,8 @@ static void timehist_header(struct perf_sched *sched)
if (sched->show_cpu_visual)
printf(" %*s ", ncpus, "");

printf(" %-20s %9s %9s %9s\n", "[tid/pid]", "(msec)", "(msec)", "(msec)");
printf(" %-*s %9s %9s %9s\n", comm_width,
"[tid/pid]", "(msec)", "(msec)", "(msec)");

/*
* separator
Expand All @@ -1840,7 +1841,7 @@ static void timehist_header(struct perf_sched *sched)
if (sched->show_cpu_visual)
printf(" %.*s ", ncpus, graph_dotted_line);

printf(" %.20s %.9s %.9s %.9s",
printf(" %.*s %.9s %.9s %.9s", comm_width,
graph_dotted_line, graph_dotted_line, graph_dotted_line,
graph_dotted_line);

Expand Down Expand Up @@ -2404,7 +2405,7 @@ static int timehist_sched_change_event(struct perf_tool *tool,
if (ptime->start && ptime->start > t)
goto out;

if (ptime->start > tprev)
if (tprev && ptime->start > tprev)
tprev = ptime->start;

/*
Expand Down Expand Up @@ -2626,9 +2627,6 @@ static void timehist_print_summary(struct perf_sched *sched,

memset(&totals, 0, sizeof(totals));

if (comm_width < 30)
comm_width = 30;

if (sched->idle_hist) {
printf("\nIdle-time summary\n");
printf("%*s parent sched-out ", comm_width, "comm");
Expand Down

0 comments on commit 3705b97

Please sign in to comment.