From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751346AbdKTGsc (ORCPT ); Mon, 20 Nov 2017 01:48:32 -0500 Received: from mga03.intel.com ([134.134.136.65]:7318 "EHLO mga03.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751314AbdKTGs3 (ORCPT ); Mon, 20 Nov 2017 01:48:29 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.44,425,1505804400"; d="scan'208";a="3784676" From: Jin Yao To: acme@kernel.org, jolsa@kernel.org, peterz@infradead.org, mingo@redhat.com, alexander.shishkin@linux.intel.com Cc: Linux-kernel@vger.kernel.org, ak@linux.intel.com, kan.liang@intel.com, yao.jin@intel.com, Jin Yao Subject: [PATCH v1 1/9] perf util: Create rblist__reset() function Date: Mon, 20 Nov 2017 22:43:36 +0800 Message-Id: <1511189024-19908-2-git-send-email-yao.jin@linux.intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1511189024-19908-1-git-send-email-yao.jin@linux.intel.com> References: <1511189024-19908-1-git-send-email-yao.jin@linux.intel.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Currently we have a rblist__delete() which is used to delete a rblist. While rblist__delete() will free the pointer of rblist at the end. It's inconvenience for user to delete a rblist which is not allocated by something like malloc(). For example, the rblist is defined in a data structure. This patch creates a new function rblist__reset() which function is similar as rblist__delete() but it will not free the rblist. Signed-off-by: Jin Yao --- tools/perf/util/rblist.c | 24 +++++++++++++++++------- tools/perf/util/rblist.h | 1 + 2 files changed, 18 insertions(+), 7 deletions(-) diff --git a/tools/perf/util/rblist.c b/tools/perf/util/rblist.c index 0dfe27d..eafa663 100644 --- a/tools/perf/util/rblist.c +++ b/tools/perf/util/rblist.c @@ -101,20 +101,30 @@ void rblist__init(struct rblist *rblist) return; } +static void remove_nodes(struct rblist *rblist) +{ + struct rb_node *pos, *next = rb_first(&rblist->entries); + + while (next) { + pos = next; + next = rb_next(pos); + rblist__remove_node(rblist, pos); + } +} + void rblist__delete(struct rblist *rblist) { if (rblist != NULL) { - struct rb_node *pos, *next = rb_first(&rblist->entries); - - while (next) { - pos = next; - next = rb_next(pos); - rblist__remove_node(rblist, pos); - } + remove_nodes(rblist); free(rblist); } } +void rblist__reset(struct rblist *rblist) +{ + remove_nodes(rblist); +} + struct rb_node *rblist__entry(const struct rblist *rblist, unsigned int idx) { struct rb_node *node; diff --git a/tools/perf/util/rblist.h b/tools/perf/util/rblist.h index 4c8638a..048c285 100644 --- a/tools/perf/util/rblist.h +++ b/tools/perf/util/rblist.h @@ -35,6 +35,7 @@ void rblist__remove_node(struct rblist *rblist, struct rb_node *rb_node); struct rb_node *rblist__find(struct rblist *rblist, const void *entry); struct rb_node *rblist__findnew(struct rblist *rblist, const void *entry); struct rb_node *rblist__entry(const struct rblist *rblist, unsigned int idx); +void rblist__reset(struct rblist *rblist); static inline bool rblist__empty(const struct rblist *rblist) { -- 2.7.4