Skip to contentSkip to conversation

perf record: Delay setting the header writing atexit call

tip:perf/core tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Feb 18, 2011 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  712a4b6049724278121d56aba683151d86c8c35a
Gitweb:     http://git.kernel.org/tip/712a4b6049724278121d56aba683151d86c8c35a
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Thu, 17 Feb 2011 12:18:42 -0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 17 Feb 2011 13:58:32 -0200

perf record: Delay setting the header writing atexit call

While testing the --filter option I noticed that we were writing lots of unneeded stuff to the perf.data header when the filter ioctl fails, so move the atexit(atexit_header) call to after we create the counters successfully.

Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Tom Zanussi <[email protected]>
LKML-Reference: <new-submission>

---
 tools/perf/builtin-record.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
tools/perf/builtin-record.c +5 -5
index a4aaadc..db4cd1e 100644
@@ -538,11 +538,6 @@ static int __cmd_record(int argc, const char **argv)
 	if (have_tracepoints(&evsel_list->entries))
 		perf_header__set_feat(&session->header, HEADER_TRACE_INFO);
 
-	/*
- 	 * perf_session__delete(session) will be called at atexit_header()
-	 */
-	atexit(atexit_header);
-
 	if (forks) {
 		child_pid = fork();
 		if (child_pid < 0) {
@@ -601,6 +596,11 @@ static int __cmd_record(int argc, const char **argv)
 
 	perf_session__set_sample_type(session, sample_type);
 
+	/*
+	 * perf_session__delete(session) will be called at atexit_header()
+	 */
+	atexit(atexit_header);
+
 	if (pipe_output) {
 		err = perf_header__write_pipe(output);
 		if (err < 0)