aboutsummaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJiri Olsa2012-10-20 15:14:10 -0500
committerGreg Kroah-Hartman2013-02-28 07:38:28 -0600
commit192212ec42e6b0f83b010f94c072b13c14ed1852 (patch)
tree02aa05bc03dbc1b3c2695a6a77cf42fd311967e3 /tools
parent98f983fc83de9034ea650d87b1ef69ff31322d5e (diff)
downloadkernel-omap-192212ec42e6b0f83b010f94c072b13c14ed1852.tar.gz
kernel-omap-192212ec42e6b0f83b010f94c072b13c14ed1852.tar.xz
kernel-omap-192212ec42e6b0f83b010f94c072b13c14ed1852.zip
perf hists: Fix period symbol_conf.field_sep display
commit c0d246b85fc7d42688d7a5d999ea671777caf65b upstream. Currently we don't properly display hist data with symbol_conf.field_sep separator. We need to display either space or separator. Signed-off-by: Jiri Olsa <jolsa@redhat.com> Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Ingo Molnar <mingo@elte.hu> Cc: Paul Mackerras <paulus@samba.org> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Link: http://lkml.kernel.org/n/tip-cyggwys0bz5kqdowwvfd8h72@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Josh Boyer <jwboyer@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools')
-rw-r--r--tools/perf/ui/hist.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index aa84130024d5..6416580b3350 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -463,11 +463,15 @@ int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
463 if (!perf_hpp__format[i].cond) 463 if (!perf_hpp__format[i].cond)
464 continue; 464 continue;
465 465
466 /*
467 * If there's no field_sep, we still need
468 * to display initial ' '.
469 */
466 if (!sep || !first) { 470 if (!sep || !first) {
467 ret = scnprintf(hpp->buf, hpp->size, "%s", sep ?: " "); 471 ret = scnprintf(hpp->buf, hpp->size, "%s", sep ?: " ");
468 advance_hpp(hpp, ret); 472 advance_hpp(hpp, ret);
473 } else
469 first = false; 474 first = false;
470 }
471 475
472 if (color && perf_hpp__format[i].color) 476 if (color && perf_hpp__format[i].color)
473 ret = perf_hpp__format[i].color(hpp, he); 477 ret = perf_hpp__format[i].color(hpp, he);