2 files changed, 23 insertions, 10 deletions

diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index 7d8dc581a545..f538794615db 100644
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -1,6 +1,7 @@
 #include "gtk.h"
 #include "util/debug.h"
 #include "util/annotate.h"
+#include "util/evsel.h"
 #include "ui/helpline.h"
 
 
@@ -32,7 +33,7 @@ static int perf_gtk__get_percent(char *buf, size_t size, struct symbol *sym,
                 return 0;
 
         symhist = annotation__histogram(symbol__annotation(sym), evidx);
-        if (!symhist->addr[dl->offset])
+        if (!symbol_conf.event_group && !symhist->addr[dl->offset])
                 return 0;
 
         percent = 100.0 * symhist->addr[dl->offset] / symhist->sum;
@@ -85,7 +86,7 @@ static int perf_gtk__get_line(char *buf, size_t size, struct disasm_line *dl)
 }
 
 static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
-                                struct map *map, int evidx,
+                                struct map *map, struct perf_evsel *evsel,
                                 struct hist_browser_timer *hbt __maybe_unused)
 {
         struct disasm_line *pos, *n;
@@ -118,10 +119,24 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
 
         list_for_each_entry(pos, &notes->src->source, node) {
                 GtkTreeIter iter;
+                int ret = 0;
 
                 gtk_list_store_append(store, &iter);
 
-                if (perf_gtk__get_percent(s, sizeof(s), sym, pos, evidx))
+                if (perf_evsel__is_group_event(evsel)) {
+                        for (i = 0; i < evsel->nr_members; i++) {
+                                ret += perf_gtk__get_percent(s + ret,
+                                                             sizeof(s) - ret,
+                                                             sym, pos,
+                                                             evsel->idx + i);
+                                ret += scnprintf(s + ret, sizeof(s) - ret, " ");
+                        }
+                } else {
+                        ret = perf_gtk__get_percent(s, sizeof(s), sym, pos,
+                                                    evsel->idx);
+                }
+
+                if (ret)
                         gtk_list_store_set(store, &iter, ANN_COL__PERCENT, s, -1);
                 if (perf_gtk__get_offset(s, sizeof(s), sym, map, pos))
                         gtk_list_store_set(store, &iter, ANN_COL__OFFSET, s, -1);
@@ -139,7 +154,8 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
         return 0;
 }
 
-int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,
+int symbol__gtk_annotate(struct symbol *sym, struct map *map,
+                         struct perf_evsel *evsel,
                          struct hist_browser_timer *hbt)
 {
         GtkWidget *window;
@@ -206,7 +222,7 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,
         gtk_notebook_append_page(GTK_NOTEBOOK(notebook), scrolled_window,
                                  tab_label);
 
-        perf_gtk__annotate_symbol(scrolled_window, sym, map, evidx, hbt);
+        perf_gtk__annotate_symbol(scrolled_window, sym, map, evsel, hbt);
         return 0;
 }
 
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) {