summaryrefslogtreecommitdiffstats
path: root/tools/perf/util/session.c
diff options
context:
space:
mode:
authorWang Nan <wangnan0@huawei.com>2016-04-13 08:21:04 +0000
committerArnaldo Carvalho de Melo <acme@redhat.com>2016-04-14 08:57:54 -0300
commitb26dc73018d2e3a68cad0cf0bad902a8637f9bdf (patch)
tree5bde43b441f56287898616365d33dfe89e76e5cc /tools/perf/util/session.c
parent4532f642974d871f9a50e9a09bc482eaed5394f6 (diff)
downloadop-kernel-dev-b26dc73018d2e3a68cad0cf0bad902a8637f9bdf.zip
op-kernel-dev-b26dc73018d2e3a68cad0cf0bad902a8637f9bdf.tar.gz
perf session: Make ordered_events reusable
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. Use ordered_events__reinit() for this. Signed-off-by: Wang Nan <wangnan0@huawei.com> Cc: Jiri Olsa <jolsa@kernel.org> Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Zefan Li <lizefan@huawei.com> Cc: pi3orama@163.com Link: http://lkml.kernel.org/r/1460535673-159866-2-git-send-email-wangnan0@huawei.com Signed-off-by: He Kuang <hekuang@huawei.com> [ Split from larger patch ] Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/util/session.c')
-rw-r--r--tools/perf/util/session.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 91d4528..ca1827c 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1836,7 +1836,11 @@ out:
out_err:
ui_progress__finish();
perf_session__warn_about_errors(session);
- ordered_events__free(&session->ordered_events);
+ /*
+ * We may switching perf.data output, make ordered_events
+ * reusable.
+ */
+ ordered_events__reinit(&session->ordered_events);
auxtrace__free_events(session);
session->one_mmap = false;
return err;
OpenPOWER on IntegriCloud