[PATCH 27/55] perf tools: Make ordered_events reusable

From	Wang Nan <wangnan0@huawei.com>
Newsgroups	linux.kernel
Subject	[PATCH 27/55] perf tools: Make ordered_events reusable
Date	2016-02-19 13:10 +0100
Message-ID	<r3S2K-4Vi-19@gated-at.bofh.it> (permalink)
References	<r3RJo-4w0-7@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

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 <wangnan0@huawei.com>
Signed-off-by: He Kuang <hekuang@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
 tools/perf/util/ordered-events.c | 5 +++++
 1 file changed, 5 insertions(+)

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);
 }
-- 
1.8.3.4

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 27/55] perf tools: Make ordered_events reusable Wang Nan <wangnan0@huawei.com> - 2016-02-19 13:10 +0100

csiph-web