From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756962Ab2JDMyH (ORCPT ); Thu, 4 Oct 2012 08:54:07 -0400 Received: from mail-pa0-f46.google.com ([209.85.220.46]:58823 "EHLO mail-pa0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756652Ab2JDMv5 (ORCPT ); Thu, 4 Oct 2012 08:51:57 -0400 From: Namhyung Kim To: Arnaldo Carvalho de Melo Cc: Ingo Molnar , Peter Zijlstra , Jiri Olsa , Stephane Eranian , LKML , Namhyung Kim Subject: [PATCH 13/20] perf hists: Maintain total periods of group members in the leader Date: Thu, 4 Oct 2012 21:49:47 +0900 Message-Id: <1349354994-17853-14-git-send-email-namhyung@kernel.org> X-Mailer: git-send-email 1.7.9.2 In-Reply-To: <1349354994-17853-1-git-send-email-namhyung@kernel.org> References: <1349354994-17853-1-git-send-email-namhyung@kernel.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Namhyung Kim Like group_stats in hist_entry, total periods information also need to be known to the leader. Cc: Jiri Olsa Cc: Stephane Eranian Signed-off-by: Namhyung Kim --- tools/perf/util/hist.c | 25 +++++++++++++++++++++++++ tools/perf/util/hist.h | 1 + 2 files changed, 26 insertions(+) diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c index 95415716c708..48488057c3da 100644 --- a/tools/perf/util/hist.c +++ b/tools/perf/util/hist.c @@ -194,6 +194,28 @@ static void hist_entry__add_group_stat(struct hist_entry *he_dest, he_stat__add_stat(&he_dest->group_stats[evsel->group_idx], src); } +static void hists__add_group_stat(struct hists *hists) +{ + struct perf_evsel *evsel = hists_2_evsel(hists); + struct perf_evsel *leader = evsel->leader; + struct hists *leader_hists; + + if (perf_evsel__is_group_leader(evsel)) + return; + + leader_hists = &leader->hists; + + if (!leader_hists->group_stats) { + leader_hists->group_stats = calloc(leader->nr_members, + sizeof(struct events_stats)); + if (!leader_hists->group_stats) + return; + } + + memcpy(&leader_hists->group_stats[evsel->group_idx], + &hists->stats, sizeof(struct events_stats)); +} + static void hist_entry__decay(struct hist_entry *he) { he->stat.period = (he->stat.period * 7) / 8; @@ -561,6 +583,9 @@ static void __hists__collapse_resort(struct hists *hists, bool threaded) hists__apply_filters(hists, n); } } + + if (symbol_conf.event_group) + hists__add_group_stat(hists); } void hists__collapse_resort(struct hists *hists) diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h index 66cb31fe81d2..e150cf86b94a 100644 --- a/tools/perf/util/hist.h +++ b/tools/perf/util/hist.h @@ -66,6 +66,7 @@ struct hists { const char *symbol_filter_str; pthread_mutex_t lock; struct events_stats stats; + struct events_stats *group_stats; u64 event_stream; u16 col_len[HISTC_NR_COLS]; }; -- 1.7.9.2