Skip to contentSkip to conversation

perf evsel: Fix order of event list deletion

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message Jan 12, 2011 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  bd3bfe9eda94d3c050830217c1e1c338808de5b2
Gitweb:     http://git.kernel.org/tip/bd3bfe9eda94d3c050830217c1e1c338808de5b2
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 11 Jan 2011 12:42:00 -0200
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Tue, 11 Jan 2011 12:51:03 -0200

perf evsel: Fix order of event list deletion

We need to defer calling perf_evsel_list__delete() till after atexit registered routines, because we need to traverse the events being recorded at that time at least on 'perf record'.

This fixes the problem reported by Thomas Renninger where cmd_record called by cmd_timechart would not write the tracing data to the perf.data file header because the evsel_list at atexit (control+C on 'perf timechart record') time would be empty, being already deleted by run_builtin(), and thus 'perf timechart' when trying to process such perf.data file would die with:

"no trace data in the file"

Problem introduced in 70d544d.

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 Thomas Renninger <[email protected]>
Cc Tom Zanussi <[email protected]>

LKML-Reference: <new-submission>

---
 tools/perf/builtin-record.c |    1 +
 tools/perf/builtin-stat.c   |    1 +
 tools/perf/builtin-top.c    |    1 +
 tools/perf/perf.c           |    2 --
 4 files changed, 3 insertions(+), 2 deletions(-)
tools/perf/builtin-record.c +1 -0
index 7069bd3..aa7ece3 100644
@@ -480,6 +480,7 @@ static void atexit_header(void)
 			process_buildids();
 		perf_header__write(&session->header, output, true);
 		perf_session__delete(session);
+		perf_evsel_list__delete();
 		symbol__exit();
 	}
 }
tools/perf/builtin-stat.c +1 -0
index c385a63..0ff11d9 100644
@@ -743,6 +743,7 @@ int cmd_stat(int argc, const char **argv, const char *prefix __used)
 out_free_fd:
 	list_for_each_entry(pos, &evsel_list, node)
 		perf_evsel__free_stat_priv(pos);
+	perf_evsel_list__delete();
 out:
 	thread_map__delete(threads);
 	threads = NULL;
tools/perf/builtin-top.c +1 -0
index 6ce4042..4b995ee 100644
@@ -1490,6 +1490,7 @@ int cmd_top(int argc, const char **argv, const char *prefix __used)
 out_free_fd:
 	list_for_each_entry(pos, &evsel_list, node)
 		perf_evsel__free_mmap(pos);
+	perf_evsel_list__delete();
 
 	return status;
 }
tools/perf/perf.c +0 -2
index 5b1ecd6..595d0f4 100644
@@ -286,8 +286,6 @@ static int run_builtin(struct cmd_struct *p, int argc, const char **argv)
 	status = p->fn(argc, argv, prefix);
 	exit_browser(status);
 
-	perf_evsel_list__delete();
-
 	if (status)
 		return status & 0xff;