Commit-ID:  2e8b79e706f504801fbce19fa9f16f3c858a105e
Gitweb:     http://git.kernel.org/tip/2e8b79e706f504801fbce19fa9f16f3c858a105e
Author:     Jiri Olsa <[email protected]>
AuthorDate: Mon, 18 Jan 2016 10:24:02 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Wed, 3 Feb 2016 11:13:12 -0300

perf hists: Use struct perf_hpp_fmt::idx in perf_hpp__reset_width

We are going to add dynamic hpp format fields, so we need to make the
'len' change for the format itself, not in the perf_hpp__format
template.

Signed-off-by: Jiri Olsa <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
---
 tools/perf/ui/hist.c | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index d392801..5a11bf0 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -629,20 +629,12 @@ unsigned int hists__sort_list_width(struct hists *hists)
 
 void perf_hpp__reset_width(struct perf_hpp_fmt *fmt, struct hists *hists)
 {
-       int idx;
-
        if (perf_hpp__is_sort_entry(fmt))
                return perf_hpp__reset_sort_width(fmt, hists);
 
-       for (idx = 0; idx < PERF_HPP__MAX_INDEX; idx++) {
-               if (fmt == &perf_hpp__format[idx])
-                       break;
-       }
-
-       if (idx == PERF_HPP__MAX_INDEX)
-               return;
+       BUG_ON(fmt->idx >= PERF_HPP__MAX_INDEX);
 
-       switch (idx) {
+       switch (fmt->idx) {
        case PERF_HPP__OVERHEAD:
        case PERF_HPP__OVERHEAD_SYS:
        case PERF_HPP__OVERHEAD_US:

Reply via email to