aboutsummaryrefslogtreecommitdiffstats
path: root/tools/perf/ui
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@kernel.org>2014-03-18 00:00:59 -0400
committerJiri Olsa <jolsa@kernel.org>2014-05-21 05:45:36 -0400
commite67d49a72df9aa50841ad400f7a99405e4980ee4 (patch)
tree4983f50b79df146a310d3ef1b9bdfa7e2f73aae1 /tools/perf/ui
parent6fe8c26d7ab9fbd6748fc40ca5fea1e3131e7236 (diff)
perf tools: Skip elided sort entries
When it converted sort entries to hpp formats, it missed se->elide handling, so add it for compatibility. Signed-off-by: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/r/1400480762-22852-16-git-send-email-namhyung@kernel.org Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Diffstat (limited to 'tools/perf/ui')
-rw-r--r--tools/perf/ui/browsers/hists.c6
-rw-r--r--tools/perf/ui/gtk/hists.c6
-rw-r--r--tools/perf/ui/stdio/hist.c9
3 files changed, 21 insertions, 0 deletions
diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 169224c31586..1c331b934ffc 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -711,6 +711,9 @@ static int hist_browser__show_entry(struct hist_browser *browser,
711 ui_browser__gotorc(&browser->b, row, 0); 711 ui_browser__gotorc(&browser->b, row, 0);
712 712
713 perf_hpp__for_each_format(fmt) { 713 perf_hpp__for_each_format(fmt) {
714 if (perf_hpp__should_skip(fmt))
715 continue;
716
714 if (current_entry && browser->b.navkeypressed) { 717 if (current_entry && browser->b.navkeypressed) {
715 ui_browser__set_color(&browser->b, 718 ui_browser__set_color(&browser->b,
716 HE_COLORSET_SELECTED); 719 HE_COLORSET_SELECTED);
@@ -1100,6 +1103,9 @@ static int hist_browser__fprintf_entry(struct hist_browser *browser,
1100 printed += fprintf(fp, "%c ", folded_sign); 1103 printed += fprintf(fp, "%c ", folded_sign);
1101 1104
1102 perf_hpp__for_each_format(fmt) { 1105 perf_hpp__for_each_format(fmt) {
1106 if (perf_hpp__should_skip(fmt))
1107 continue;
1108
1103 if (!first) { 1109 if (!first) {
1104 ret = scnprintf(hpp.buf, hpp.size, " "); 1110 ret = scnprintf(hpp.buf, hpp.size, " ");
1105 advance_hpp(&hpp, ret); 1111 advance_hpp(&hpp, ret);
diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index fd52669018ee..9d90683914d4 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -178,6 +178,9 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
178 col_idx = 0; 178 col_idx = 0;
179 179
180 perf_hpp__for_each_format(fmt) { 180 perf_hpp__for_each_format(fmt) {
181 if (perf_hpp__should_skip(fmt))
182 continue;
183
181 fmt->header(fmt, &hpp, hists_to_evsel(hists)); 184 fmt->header(fmt, &hpp, hists_to_evsel(hists));
182 185
183 gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view), 186 gtk_tree_view_insert_column_with_attributes(GTK_TREE_VIEW(view),
@@ -222,6 +225,9 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists,
222 col_idx = 0; 225 col_idx = 0;
223 226
224 perf_hpp__for_each_format(fmt) { 227 perf_hpp__for_each_format(fmt) {
228 if (perf_hpp__should_skip(fmt))
229 continue;
230
225 if (fmt->color) 231 if (fmt->color)
226 fmt->color(fmt, &hpp, h); 232 fmt->color(fmt, &hpp, h);
227 else 233 else
diff --git a/tools/perf/ui/stdio/hist.c b/tools/perf/ui/stdio/hist.c
index 49e2e4a7346a..e3fdf4e869fc 100644
--- a/tools/perf/ui/stdio/hist.c
+++ b/tools/perf/ui/stdio/hist.c
@@ -318,6 +318,9 @@ static int hist_entry__snprintf(struct hist_entry *he, struct perf_hpp *hpp)
318 return 0; 318 return 0;
319 319
320 perf_hpp__for_each_format(fmt) { 320 perf_hpp__for_each_format(fmt) {
321 if (perf_hpp__should_skip(fmt))
322 continue;
323
321 /* 324 /*
322 * If there's no field_sep, we still need 325 * If there's no field_sep, we still need
323 * to display initial ' '. 326 * to display initial ' '.
@@ -407,6 +410,9 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
407 fprintf(fp, "# "); 410 fprintf(fp, "# ");
408 411
409 perf_hpp__for_each_format(fmt) { 412 perf_hpp__for_each_format(fmt) {
413 if (perf_hpp__should_skip(fmt))
414 continue;
415
410 if (!first) 416 if (!first)
411 fprintf(fp, "%s", sep ?: " "); 417 fprintf(fp, "%s", sep ?: " ");
412 else 418 else
@@ -430,6 +436,9 @@ size_t hists__fprintf(struct hists *hists, bool show_header, int max_rows,
430 perf_hpp__for_each_format(fmt) { 436 perf_hpp__for_each_format(fmt) {
431 unsigned int i; 437 unsigned int i;
432 438
439 if (perf_hpp__should_skip(fmt))
440 continue;
441
433 if (!first) 442 if (!first)
434 fprintf(fp, "%s", sep ?: " "); 443 fprintf(fp, "%s", sep ?: " ");
435 else 444 else