diff options
author | Wang Nan <wangnan0@huawei.com> | 2016-04-13 04:21:04 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2016-04-14 07:57:54 -0400 |
commit | b26dc73018d2e3a68cad0cf0bad902a8637f9bdf (patch) | |
tree | 5bde43b441f56287898616365d33dfe89e76e5cc /tools/perf/util/session.c | |
parent | 4532f642974d871f9a50e9a09bc482eaed5394f6 (diff) |
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.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c index 91d4528d71fa..ca1827c4af4a 100644 --- a/tools/perf/util/session.c +++ b/tools/perf/util/session.c | |||
@@ -1836,7 +1836,11 @@ out: | |||
1836 | out_err: | 1836 | out_err: |
1837 | ui_progress__finish(); | 1837 | ui_progress__finish(); |
1838 | perf_session__warn_about_errors(session); | 1838 | perf_session__warn_about_errors(session); |
1839 | ordered_events__free(&session->ordered_events); | 1839 | /* |
1840 | * We may switching perf.data output, make ordered_events | ||
1841 | * reusable. | ||
1842 | */ | ||
1843 | ordered_events__reinit(&session->ordered_events); | ||
1840 | auxtrace__free_events(session); | 1844 | auxtrace__free_events(session); |
1841 | session->one_mmap = false; | 1845 | session->one_mmap = false; |
1842 | return err; | 1846 | return err; |