Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1311421

[PATCH 03/26] perf tools: Add _idx fields into struct perf_hpp_fmt

From Jiri Olsa <jolsa@kernel.org>
Newsgroups linux.kernel
Subject [PATCH 03/26] perf tools: Add _idx fields into struct perf_hpp_fmt
Date 2016-01-18 10:40 +0100
Message-ID <qSes2-78G-37@gated-at.bofh.it> (permalink)
References <qSeil-73y-3@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw

Currently there's no way of comparing hpp format entries,
which is needed in following patches.

Adding _idx fields into struct perf_hpp_fmt to recognize
and be able to compare hpp format entries.

Link: http://lkml.kernel.org/n/tip-fz58ixswttfdcmv5o7v5b9j4@git.kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
 tools/perf/ui/hist.c   | 25 ++++++++++++++-----------
 tools/perf/util/hist.h |  1 +
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index bf2a66e254ea..d392801ea17e 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -371,7 +371,7 @@ static int64_t hpp__nop_cmp(struct perf_hpp_fmt *fmt __maybe_unused,
 	return 0;
 }
 
-#define HPP__COLOR_PRINT_FNS(_name, _fn)		\
+#define HPP__COLOR_PRINT_FNS(_name, _fn, _idx)		\
 	{						\
 		.name   = _name,			\
 		.header	= hpp__header_fn,		\
@@ -381,9 +381,10 @@ static int64_t hpp__nop_cmp(struct perf_hpp_fmt *fmt __maybe_unused,
 		.cmp	= hpp__nop_cmp,			\
 		.collapse = hpp__nop_cmp,		\
 		.sort	= hpp__sort_ ## _fn,		\
+		.idx	= PERF_HPP__ ## _idx,		\
 	}
 
-#define HPP__COLOR_ACC_PRINT_FNS(_name, _fn)		\
+#define HPP__COLOR_ACC_PRINT_FNS(_name, _fn, _idx)	\
 	{						\
 		.name   = _name,			\
 		.header	= hpp__header_fn,		\
@@ -393,9 +394,10 @@ static int64_t hpp__nop_cmp(struct perf_hpp_fmt *fmt __maybe_unused,
 		.cmp	= hpp__nop_cmp,			\
 		.collapse = hpp__nop_cmp,		\
 		.sort	= hpp__sort_ ## _fn,		\
+		.idx	= PERF_HPP__ ## _idx,		\
 	}
 
-#define HPP__PRINT_FNS(_name, _fn)			\
+#define HPP__PRINT_FNS(_name, _fn, _idx)		\
 	{						\
 		.name   = _name,			\
 		.header	= hpp__header_fn,		\
@@ -404,17 +406,18 @@ static int64_t hpp__nop_cmp(struct perf_hpp_fmt *fmt __maybe_unused,
 		.cmp	= hpp__nop_cmp,			\
 		.collapse = hpp__nop_cmp,		\
 		.sort	= hpp__sort_ ## _fn,		\
+		.idx	= PERF_HPP__ ## _idx,		\
 	}
 
 struct perf_hpp_fmt perf_hpp__format[] = {
-	HPP__COLOR_PRINT_FNS("Overhead", overhead),
-	HPP__COLOR_PRINT_FNS("sys", overhead_sys),
-	HPP__COLOR_PRINT_FNS("usr", overhead_us),
-	HPP__COLOR_PRINT_FNS("guest sys", overhead_guest_sys),
-	HPP__COLOR_PRINT_FNS("guest usr", overhead_guest_us),
-	HPP__COLOR_ACC_PRINT_FNS("Children", overhead_acc),
-	HPP__PRINT_FNS("Samples", samples),
-	HPP__PRINT_FNS("Period", period)
+	HPP__COLOR_PRINT_FNS("Overhead", overhead, OVERHEAD),
+	HPP__COLOR_PRINT_FNS("sys", overhead_sys, OVERHEAD_SYS),
+	HPP__COLOR_PRINT_FNS("usr", overhead_us, OVERHEAD_US),
+	HPP__COLOR_PRINT_FNS("guest sys", overhead_guest_sys, OVERHEAD_GUEST_SYS),
+	HPP__COLOR_PRINT_FNS("guest usr", overhead_guest_us, OVERHEAD_GUEST_US),
+	HPP__COLOR_ACC_PRINT_FNS("Children", overhead_acc, OVERHEAD_ACC),
+	HPP__PRINT_FNS("Samples", samples, SAMPLES),
+	HPP__PRINT_FNS("Period", period, PERIOD)
 };
 
 LIST_HEAD(perf_hpp__list);
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index bc2499794bef..8a0cbdeb449e 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -221,6 +221,7 @@ struct perf_hpp_fmt {
 	bool elide;
 	int len;
 	int user_len;
+	int idx;
 };
 
 extern struct list_head perf_hpp__list;
-- 
2.4.3

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 14/26] perf tools: Introduce struct perf_hpp_list Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
    Re: [PATCH 14/26] perf tools: Introduce struct perf_hpp_list Namhyung Kim <namhyung@kernel.org> - 2016-01-25 16:10 +0100
      Re: [PATCH 14/26] perf tools: Introduce struct perf_hpp_list Jiri Olsa <jolsa@redhat.com> - 2016-01-25 16:10 +0100
  [PATCH 21/26] perf tools: Introduce perf_hpp_list__for_each_sort_list macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 16/26] perf tools: Add perf_hpp_list register helpers Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 17/26] perf tools: Pass perf_hpp_list all the way through setup_sort_list Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 09/26] perf tools: Allocate output sort field Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 13/26] perf tools: Separate output fields parsing into setup_output_list function Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 15/26] perf tools: Introduce perf_hpp_list__init function Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 11/26] perf tools: Properly release format fields Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 07/26] perf tools: Make hpp setup function generic Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 12/26] perf tools: Separate sort fields parsing into setup_sort_list function Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 20/26] perf tools: Introduce perf_hpp_list__for_each_format_safe macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 23/26] perf tools: Add struct perf_hpp_list argument to helper functions Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 26/26] perf tools: Introduce hists__for_each_sort_list macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 06/26] perf tools: Add hpp__equal callback function Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 22/26] perf tools: Introduce perf_hpp_list__for_each_sort_list_safe macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 19/26] perf tools: Introduce perf_hpp_list__for_each_format macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 25/26] perf tools: Introduce hists__for_each_format macro Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:30 +0100
  [PATCH 01/26] perf tools: Factor output_resort from hists__output_resort Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:40 +0100
  [PATCH 05/26] perf tools: Add equal method to perf_hpp_fmt struct Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:40 +0100
  [PATCH 03/26] perf tools: Add _idx fields into struct perf_hpp_fmt Jiri Olsa <jolsa@kernel.org> - 2016-01-18 10:40 +0100
  Re: [RFC 00/26] perf tools: Introduce hists specific format entries Namhyung Kim <namhyung@kernel.org> - 2016-01-19 14:00 +0100
    Re: [RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa <jolsa@redhat.com> - 2016-01-19 14:30 +0100
  Re: [RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa <jolsa@redhat.com> - 2016-01-25 08:20 +0100
    Re: [RFC 00/26] perf tools: Introduce hists specific format entries Namhyung Kim <namhyung@kernel.org> - 2016-01-25 15:30 +0100
      Re: [RFC 00/26] perf tools: Introduce hists specific format entries Jiri Olsa <jolsa@redhat.com> - 2016-01-25 15:40 +0100

csiph-web