From patchwork Mon Jan 25 09:56:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wang Nan X-Patchwork-Id: 60308 Delivered-To: patch@linaro.org Received: by 10.112.130.2 with SMTP id oa2csp1257757lbb; Mon, 25 Jan 2016 02:06:09 -0800 (PST) X-Received: by 10.67.3.170 with SMTP id bx10mr24763344pad.34.1453716369092; Mon, 25 Jan 2016 02:06:09 -0800 (PST) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m65si32705107pfi.251.2016.01.25.02.06.08; Mon, 25 Jan 2016 02:06:09 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756783AbcAYKGG (ORCPT + 30 others); Mon, 25 Jan 2016 05:06:06 -0500 Received: from szxga01-in.huawei.com ([58.251.152.64]:39232 "EHLO szxga01-in.huawei.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756659AbcAYJ67 (ORCPT ); Mon, 25 Jan 2016 04:58:59 -0500 Received: from 172.24.1.51 (EHLO szxeml428-hub.china.huawei.com) ([172.24.1.51]) by szxrg01-dlp.huawei.com (MOS 4.3.7-GA FastPath queued) with ESMTP id DDR51109; Mon, 25 Jan 2016 17:57:37 +0800 (CST) Received: from linux-4hy3.site (10.107.193.248) by szxeml428-hub.china.huawei.com (10.82.67.183) with Microsoft SMTP Server id 14.3.235.1; Mon, 25 Jan 2016 17:57:26 +0800 From: Wang Nan To: Alexei Starovoitov , Arnaldo Carvalho de Melo CC: Brendan Gregg , Daniel Borkmann , "David S. Miller" , He Kuang , Jiri Olsa , Li Zefan , Masami Hiramatsu , Namhyung Kim , Peter Zijlstra , , Will Deacon , , Wang Nan Subject: [PATCH 27/54] perf tools: Make ordered_events reusable Date: Mon, 25 Jan 2016 09:56:14 +0000 Message-ID: <1453715801-7732-28-git-send-email-wangnan0@huawei.com> X-Mailer: git-send-email 1.8.3.4 In-Reply-To: <1453715801-7732-1-git-send-email-wangnan0@huawei.com> References: <1453715801-7732-1-git-send-email-wangnan0@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.107.193.248] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A020204.56A5F193.00AD, ss=1, re=0.000, recu=0.000, reip=0.000, cl=1, cld=1, fgs=0, ip=0.0.0.0, so=2013-06-18 04:22:30, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: 3265d17b36341ff0b735f6ad2bf82437 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ordered_events__free() leaves linked lists and timestamps not cleared, so unable to be reused after ordered_events__free(). Which is inconvenient after 'perf record' supports generating multiple perf.data output and process build-ids for each of them. Calls ordered_events__init() in ordered_events__free() so ordered_events can be reused. 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 | 5 +++++ 1 file changed, 5 insertions(+) -- 1.8.3.4 diff --git a/tools/perf/util/ordered-events.c b/tools/perf/util/ordered-events.c index b1b9e23..70c0dc8 100644 --- a/tools/perf/util/ordered-events.c +++ b/tools/perf/util/ordered-events.c @@ -299,6 +299,8 @@ void ordered_events__init(struct ordered_events *oe, ordered_events__deliver_t d void ordered_events__free(struct ordered_events *oe) { + ordered_events__deliver_t old_deliver = oe->deliver; + while (!list_empty(&oe->to_free)) { struct ordered_event *event; @@ -307,4 +309,7 @@ void ordered_events__free(struct ordered_events *oe) free_dup_event(oe, event->event); free(event); } + + memset(oe, '\0', sizeof(*oe)); + ordered_events__init(oe, old_deliver); }