From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933715AbcAKVd1 (ORCPT ); Mon, 11 Jan 2016 16:33:27 -0500 Received: from mail.kernel.org ([198.145.29.136]:50619 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757640AbcAKVdZ (ORCPT ); Mon, 11 Jan 2016 16:33:25 -0500 Date: Mon, 11 Jan 2016 18:33:20 -0300 From: Arnaldo Carvalho de Melo To: Wang Nan Cc: linux-kernel@vger.kernel.org, pi3orama@163.com, lizefan@huawei.com, netdev@vger.kernel.org, davem@davemloft.net, He Kuang , Jiri Olsa , Masami Hiramatsu , Namhyung Kim Subject: Re: [PATCH 29/53] perf tools: Make ordered_events reusable Message-ID: <20160111213320.GH18367@kernel.org> References: <1452520124-2073-1-git-send-email-wangnan0@huawei.com> <1452520124-2073-30-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1452520124-2073-30-git-send-email-wangnan0@huawei.com> X-Url: http://acmel.wordpress.com User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Mon, Jan 11, 2016 at 01:48:20PM +0000, Wang Nan escreveu: > ordered_events__free() leaves linked lists and timestamps not cleared. > Introduce ordered_events__reset() to reinit ordered_events so it can > be reused again. Reused where? Can you mention the usecase? Do we have to introduce a new function? Why not just make ordered_events__free() to get the state to what was after ordered_events__init()? - Arnaldo > Signed-off-by: Wang Nan > Signed-off-by: He Kuang > Cc: Arnaldo Carvalho de Melo > Cc: Jiri Olsa > Cc: Masami Hiramatsu > Cc: Namhyung Kim > Cc: Zefan Li > Cc: pi3orama@163.com > --- > tools/perf/util/ordered-events.c | 9 +++++++++ > tools/perf/util/ordered-events.h | 1 + > tools/perf/util/session.c | 4 ++-- > 3 files changed, 12 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c > index b1b9e23..81daada 100644 > --- a/tools/perf/util/ordered-events.c > +++ b/tools/perf/util/ordered-events.c > @@ -308,3 +308,12 @@ void ordered_events__free(struct ordered_events *oe) > free(event); > } > } > + > +void ordered_events__reset(struct ordered_events *oe) > +{ > + ordered_events__deliver_t old_deliver = oe->deliver; > + > + ordered_events__free(oe); > + memset(oe, '\0', sizeof(*oe)); > + ordered_events__init(oe, old_deliver); > +} > diff --git a/tools/perf/util/ordered-events.h b/tools/perf/util/ordered-events.h > index f403991..77e0f1b 100644 > --- a/tools/perf/util/ordered-events.h > +++ b/tools/perf/util/ordered-events.h > @@ -49,6 +49,7 @@ void ordered_events__delete(struct ordered_events *oe, struct ordered_event *eve > int ordered_events__flush(struct ordered_events *oe, enum oe_flush how); > void ordered_events__init(struct ordered_events *oe, ordered_events__deliver_t deliver); > void ordered_events__free(struct ordered_events *oe); > +void ordered_events__reset(struct ordered_events *oe); > > static inline > void ordered_events__set_alloc_size(struct ordered_events *oe, u64 size) > diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c > index d5636ba..96e10d2 100644 > --- a/tools/perf/util/session.c > +++ b/tools/perf/util/session.c > @@ -1701,7 +1701,7 @@ done: > out_err: > free(buf); > perf_session__warn_about_errors(session); > - ordered_events__free(&session->ordered_events); > + ordered_events__reset(&session->ordered_events); > auxtrace__free_events(session); > return err; > } > @@ -1857,7 +1857,7 @@ out: > out_err: > ui_progress__finish(); > perf_session__warn_about_errors(session); > - ordered_events__free(&session->ordered_events); > + ordered_events__reset(&session->ordered_events); > auxtrace__free_events(session); > session->one_mmap = false; > return err; > -- > 1.8.3.4