From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752762AbdLFQmM (ORCPT ); Wed, 6 Dec 2017 11:42:12 -0500 Received: from terminus.zytor.com ([65.50.211.136]:38679 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752362AbdLFQlf (ORCPT ); Wed, 6 Dec 2017 11:41:35 -0500 Date: Wed, 6 Dec 2017 08:37:21 -0800 From: tip-bot for Jin Yao Message-ID: Cc: peterz@infradead.org, jolsa@kernel.org, linux-kernel@vger.kernel.org, kan.liang@intel.com, hpa@zytor.com, alexander.shishkin@linux.intel.com, acme@redhat.com, yao.jin@linux.intel.com, tglx@linutronix.de, ak@linux.intel.com, mingo@kernel.org Reply-To: jolsa@kernel.org, peterz@infradead.org, kan.liang@intel.com, hpa@zytor.com, linux-kernel@vger.kernel.org, yao.jin@linux.intel.com, acme@redhat.com, alexander.shishkin@linux.intel.com, mingo@kernel.org, ak@linux.intel.com, tglx@linutronix.de In-Reply-To: <1512125856-22056-5-git-send-email-yao.jin@linux.intel.com> References: <1512125856-22056-5-git-send-email-yao.jin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Add rbtree node_delete op Git-Commit-ID: b984aff7811bbac75b3f05931643d815067cf45c X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: b984aff7811bbac75b3f05931643d815067cf45c Gitweb: https://git.kernel.org/tip/b984aff7811bbac75b3f05931643d815067cf45c Author: Jin Yao AuthorDate: Fri, 1 Dec 2017 18:57:28 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 5 Dec 2017 10:24:31 -0300 perf stat: Add rbtree node_delete op In current stat-shadow.c, the rbtree deleting is ignored. The patch adds the implementation to node_delete method of rblist. Signed-off-by: Jin Yao Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: Kan Liang Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1512125856-22056-5-git-send-email-yao.jin@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/stat-shadow.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/stat-shadow.c b/tools/perf/util/stat-shadow.c index 855e35c..57ec225 100644 --- a/tools/perf/util/stat-shadow.c +++ b/tools/perf/util/stat-shadow.c @@ -87,6 +87,16 @@ static struct rb_node *saved_value_new(struct rblist *rblist __maybe_unused, return &nd->rb_node; } +static void saved_value_delete(struct rblist *rblist __maybe_unused, + struct rb_node *rb_node) +{ + struct saved_value *v; + + BUG_ON(!rb_node); + v = container_of(rb_node, struct saved_value, rb_node); + free(v); +} + static struct saved_value *saved_value_lookup(struct perf_evsel *evsel, int cpu, bool create) @@ -114,7 +124,7 @@ void perf_stat__init_shadow_stats(void) rblist__init(&runtime_saved_values); runtime_saved_values.node_cmp = saved_value_cmp; runtime_saved_values.node_new = saved_value_new; - /* No delete for now */ + runtime_saved_values.node_delete = saved_value_delete; } static int evsel_context(struct perf_evsel *evsel)