From: Namhyung Kim <namhyung@kernel.org>
To: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>,
Paul Mackerras <paulus@samba.org>, Ingo Molnar <mingo@kernel.org>,
LKML <linux-kernel@vger.kernel.org>, Jiri Olsa <jolsa@redhat.com>,
Stephane Eranian <eranian@google.com>,
Namhyung Kim <namhyung.kim@lge.com>,
Pekka Enberg <penberg@kernel.org>
Subject: [PATCH 09/14] perf gtk/browser: Add support for event group view
Date: Mon, 17 Dec 2012 15:39:00 +0900 [thread overview]
Message-ID: <1355726345-29553-10-git-send-email-namhyung@kernel.org> (raw)
In-Reply-To: <1355726345-29553-1-git-send-email-namhyung@kernel.org>
From: Namhyung Kim <namhyung.kim@lge.com>
Show group members' overhead also when showing the leader's if event
group is enabled. Use macro for defining hpp functions which looks
almost identical.
Unlike other hpp backend, GTK+ needs to print dummy 0.00% output since
it's displayed with variable width fonts. So that simply skipping
with %*s trick won't work well here.
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Stephane Eranian <eranian@google.com>
Cc: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
---
tools/perf/ui/gtk/browser.c | 117 +++++++++++++++++++++++++++++++++++---------
1 file changed, 94 insertions(+), 23 deletions(-)
diff --git a/tools/perf/ui/gtk/browser.c b/tools/perf/ui/gtk/browser.c
index 0d94b3ba054a..a82e903703b4 100644
--- a/tools/perf/ui/gtk/browser.c
+++ b/tools/perf/ui/gtk/browser.c
@@ -45,34 +45,104 @@ static const char *perf_gtk__get_percent_color(double percent)
return NULL;
}
-#define HPP__COLOR_FN(_name, _field) \
-static int \
-perf_gtk__hpp_color_ ## _name(struct perf_hpp_fmt *fmt __maybe_unused, \
- struct perf_hpp *hpp, \
- struct hist_entry *he) \
+static int perf_gtk__percent_color_snprintf(char *buf, size_t size,
+ double percent)
+{
+ int ret = 0;
+ const char *markup;
+
+ markup = perf_gtk__get_percent_color(percent);
+ if (markup)
+ ret += scnprintf(buf, size, markup);
+
+ ret += scnprintf(buf + ret, size - ret, "%6.2f%%", percent);
+
+ if (markup)
+ ret += scnprintf(buf + ret, size - ret, "</span>");
+
+ return ret;
+}
+
+
+static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he,
+ u64 (*get_field)(struct hist_entry *))
+{
+ int ret;
+ double percent = 0.0;
+ struct hists *hists = he->hists;
+
+ if (hists->stats.total_period)
+ percent = 100.0 * get_field(he) / hists->stats.total_period;
+
+ ret = perf_gtk__percent_color_snprintf(hpp->buf, hpp->size, percent);
+
+ if (symbol_conf.event_group) {
+ int prev_idx, idx_delta;
+ struct perf_evsel *evsel = hists_to_evsel(hists);
+ struct hist_entry *pair;
+ int nr_members = evsel->nr_members;
+
+ if (nr_members <= 1)
+ return ret;
+
+ prev_idx = perf_evsel__group_idx(evsel);
+
+ list_for_each_entry(pair, &he->pairs.head, pairs.node) {
+ u64 period = get_field(pair);
+ u64 total = pair->hists->stats.total_period;
+
+ evsel = hists_to_evsel(pair->hists);
+ idx_delta = perf_evsel__group_idx(evsel) - prev_idx - 1;
+
+ while (idx_delta--) {
+ ret += scnprintf(hpp->buf + ret, hpp->size -ret, " ");
+ ret += perf_gtk__percent_color_snprintf(hpp->buf + ret,
+ hpp->size - ret,
+ 0.0);
+ }
+
+ percent = 100.0 * period / total;
+ ret += scnprintf(hpp->buf + ret, hpp->size -ret, " ");
+ ret += perf_gtk__percent_color_snprintf(hpp->buf + ret,
+ hpp->size - ret,
+ percent);
+
+ prev_idx = perf_evsel__group_idx(evsel);
+ }
+
+ idx_delta = nr_members - prev_idx - 1;
+
+ while (idx_delta--) {
+ ret += scnprintf(hpp->buf + ret, hpp->size -ret, " ");
+ ret += perf_gtk__percent_color_snprintf(hpp->buf + ret,
+ hpp->size - ret,
+ 0.0);
+ }
+ }
+ return ret;
+}
+
+#define __HPP_COLOR_PERCENT_FN(_type, _field) \
+static u64 he_get_##_field(struct hist_entry *he) \
{ \
- struct hists *hists = he->hists; \
- double percent = 100.0 * he->stat._field / hists->stats.total_period; \
- const char *markup; \
- int ret = 0; \
+ return he->stat._field; \
+} \
\
- markup = perf_gtk__get_percent_color(percent); \
- if (markup) \
- ret += scnprintf(hpp->buf, hpp->size, "%s", markup); \
- ret += scnprintf(hpp->buf + ret, hpp->size - ret, "%6.2f%%", percent); \
- if (markup) \
- ret += scnprintf(hpp->buf + ret, hpp->size - ret, "</span>"); \
- \
- return ret; \
+static int perf_gtk__hpp_color_##_type(struct perf_hpp_fmt *phf __maybe_unused, \
+ struct perf_hpp *hpp, \
+ struct hist_entry *he) \
+{ \
+ return __hpp__color_fmt(hpp, he, he_get_##_field); \
}
-HPP__COLOR_FN(overhead, period)
-HPP__COLOR_FN(overhead_sys, period_sys)
-HPP__COLOR_FN(overhead_us, period_us)
-HPP__COLOR_FN(overhead_guest_sys, period_guest_sys)
-HPP__COLOR_FN(overhead_guest_us, period_guest_us)
+__HPP_COLOR_PERCENT_FN(overhead, period)
+__HPP_COLOR_PERCENT_FN(overhead_sys, period_sys)
+__HPP_COLOR_PERCENT_FN(overhead_us, period_us)
+__HPP_COLOR_PERCENT_FN(overhead_guest_sys, period_guest_sys)
+__HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us)
+
+#undef __HPP_COLOR_PERCENT_FN
-#undef HPP__COLOR_FN
void perf_gtk__init_hpp(void)
{
@@ -106,6 +176,7 @@ static void perf_gtk__show_hists(GtkWidget *window, struct hists *hists)
struct perf_hpp hpp = {
.buf = s,
.size = sizeof(s),
+ .ptr = hists_to_evsel(hists),
};
nr_cols = 0;
--
1.7.11.7
next prev parent reply other threads:[~2012-12-17 6:41 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-17 6:38 [PATCH 00/14] perf report: Add support for event group view (v7) Namhyung Kim
2012-12-17 6:38 ` [PATCH 01/14] perf tools: Keep group information Namhyung Kim
2012-12-18 15:28 ` Jiri Olsa
2012-12-17 6:38 ` [PATCH 02/14] perf test: Add group test conditions Namhyung Kim
2012-12-18 15:28 ` Jiri Olsa
2012-12-17 6:38 ` [PATCH 03/14] perf header: Ensure read/write finished successfully Namhyung Kim
2012-12-18 15:30 ` Jiri Olsa
2013-01-25 11:06 ` [tip:perf/core] perf header: Ensure read/ write " tip-bot for Namhyung Kim
2012-12-17 6:38 ` [PATCH 04/14] perf header: Add HEADER_GROUP_DESC feature Namhyung Kim
2012-12-17 6:38 ` [PATCH 05/14] perf report: Make another loop for linking group hists Namhyung Kim
2012-12-18 15:32 ` Jiri Olsa
2012-12-17 6:38 ` [PATCH 06/14] perf hists: Resort hist entries using group members for output Namhyung Kim
2012-12-18 15:39 ` Jiri Olsa
2012-12-17 6:38 ` [PATCH 07/14] perf ui/hist: Add support for event group view Namhyung Kim
2012-12-18 15:47 ` Jiri Olsa
2012-12-20 2:59 ` Namhyung Kim
2012-12-18 19:30 ` Arnaldo Carvalho de Melo
2012-12-20 2:34 ` Namhyung Kim
2012-12-17 6:38 ` [PATCH 08/14] perf hist browser: " Namhyung Kim
2012-12-17 6:39 ` Namhyung Kim [this message]
2012-12-17 6:39 ` [PATCH 10/14] perf gtk/browser: Trim column header string when event group enabled Namhyung Kim
2012-12-17 6:39 ` [PATCH 11/14] perf report: Bypass non-leader events when event group is enabled Namhyung Kim
2012-12-17 6:39 ` [PATCH 12/14] perf report: Show group description " Namhyung Kim
2012-12-17 6:39 ` [PATCH 13/14] perf report: Add --group option Namhyung Kim
2012-12-17 6:39 ` [PATCH 14/14] perf report: Add report.group config option Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1355726345-29553-10-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@ghostprotocols.net \
--cc=eranian@google.com \
--cc=jolsa@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=namhyung.kim@lge.com \
--cc=paulus@samba.org \
--cc=penberg@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).