perf evsel: Introduce perf_evsel__is_group_event() helper

The perf_evsel__is_group_event function is for checking whether given
evsel needs event group view support or not.  Please note that it's
different to the existing perf_evsel__is_group_leader() which checks
only the given evsel is a leader or a standalone (i.e. non-group) event
regardless of event group feature.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1362462812-30885-7-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

3 files changed, 6 insertions, 12 deletions

diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c
index 0e125e1543dc..a5843fd6ab51 100644
--- a/tools/perf/ui/browsers/hists.c
+++ b/tools/perf/ui/browsers/hists.c
@@ -1193,7 +1193,7 @@ static int hists__browser_title(struct hists *hists, char *bf, size_t size,
         char buf[512];
         size_t buflen = sizeof(buf);
 
-        if (symbol_conf.event_group && evsel->nr_members > 1) {
+        if (perf_evsel__is_group_event(evsel)) {
                 struct perf_evsel *pos;
 
                 perf_evsel__group_desc(evsel, buf, buflen);
@@ -1709,7 +1709,7 @@ static void perf_evsel_menu__write(struct ui_browser *browser,
         ui_browser__set_color(browser, current_entry ? HE_COLORSET_SELECTED :
                                                        HE_COLORSET_NORMAL);
 
-        if (symbol_conf.event_group && evsel->nr_members > 1) {
+        if (perf_evsel__is_group_event(evsel)) {
                 struct perf_evsel *pos;
 
                 ev_name = perf_evsel__group_name(evsel);
diff --git a/tools/perf/ui/gtk/hists.c b/tools/perf/ui/gtk/hists.c
index 1e764a8ad259..6f259b3d14e2 100644
--- a/tools/perf/ui/gtk/hists.c
+++ b/tools/perf/ui/gtk/hists.c
@@ -32,21 +32,18 @@ static int __hpp__color_fmt(struct perf_hpp *hpp, struct hist_entry *he,
         int ret;
         double percent = 0.0;
         struct hists *hists = he->hists;
+        struct perf_evsel *evsel = hists_to_evsel(hists);
 
         if (hists->stats.total_period)
                 percent = 100.0 * get_field(he) / hists->stats.total_period;
 
         ret = __percent_color_snprintf(hpp->buf, hpp->size, percent);
 
-        if (symbol_conf.event_group) {
+        if (perf_evsel__is_group_event(evsel)) {
                 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) {
diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
index d671e63aa351..4bf91b09d62d 100644
--- a/tools/perf/ui/hist.c
+++ b/tools/perf/ui/hist.c
@@ -16,6 +16,7 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
 {
         int ret;
         struct hists *hists = he->hists;
+        struct perf_evsel *evsel = hists_to_evsel(hists);
 
         if (fmt_percent) {
                 double percent = 0.0;
@@ -28,15 +29,11 @@ static int __hpp__fmt(struct perf_hpp *hpp, struct hist_entry *he,
         } else
                 ret = print_fn(hpp->buf, hpp->size, fmt, get_field(he));
 
-        if (symbol_conf.event_group) {
+        if (perf_evsel__is_group_event(evsel)) {
                 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) {