]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
perf tools: Fix assertion failure on dynamic entry
authorNamhyung Kim <namhyung@kernel.org>
Sun, 21 Feb 2016 14:22:34 +0000 (23:22 +0900)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 22 Feb 2016 15:07:14 +0000 (12:07 -0300)
The dynamic entry is created for each field in a tracepoint event.
Since they have no fixed hpp format index, it should skip when
perf_hpp__reset_width() is called.

This caused following assertion failure..

  $ perf record -e sched:sched_switch -a sleep 1

  $ perf report -s comm,next_pid --stdio
  perf: ui/hist.c:651: perf_hpp__reset_width:
    Assertion `!(fmt->idx >= PERF_HPP__MAX_INDEX)' failed.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Acked-by: Jiri Olsa <jolsa@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1456064558-13086-1-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/ui/hist.c

index 1ba4117d9c2de0d2f6326c1bc160c4d6171efae0..12223d791e9f3a6b888c201dec1680570f797b23 100644 (file)
@@ -645,6 +645,9 @@ void perf_hpp__reset_width(struct perf_hpp_fmt *fmt, struct hists *hists)
        if (perf_hpp__is_sort_entry(fmt))
                return perf_hpp__reset_sort_width(fmt, hists);
 
+       if (perf_hpp__is_dynamic_entry(fmt))
+               return;
+
        BUG_ON(fmt->idx >= PERF_HPP__MAX_INDEX);
 
        switch (fmt->idx) {