Skip to content

Commit

Permalink
perf record: Delay setting the header writing atexit call
Browse files Browse the repository at this point in the history
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 <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed Feb 17, 2011
1 parent fec9cbd commit 712a4b6
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions tools/perf/builtin-record.c
Original file line number Diff line number Diff line change
@@ -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)

0 comments on commit 712a4b6

Please sign in to comment.