Skip to contentSkip to conversation

perf top: Set the 'session_done' volatile variable when exiting

tip:perf/core tip-bot for Jiri Olsa 1 participant 1 message Dec 14, 2018 perf events

lore
Share & tools
lore

tip-bot for Jiri Olsa

author merge bot
#0 lore raw
Commit-ID:  2e86f646dd68cfdb412efd1262ff75e25fbbe050
Gitweb:     https://git.kernel.org/tip/2e86f646dd68cfdb412efd1262ff75e25fbbe050
Author:     Jiri Olsa <[email protected]>
AuthorDate: Wed, 7 Nov 2018 20:11:19 +0100
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Thu, 6 Dec 2018 14:12:33 -0300

perf top: Set the 'session_done' volatile variable when exiting

So we can get out of hist processing ASAP on user request.

Acked-by David S. Miller <[email protected]>
Acked-by Namhyung Kim <[email protected]>
Tested-by Arnaldo Carvalho de Melo <[email protected]>
Cc Alexander Shishkin <[email protected]>
Cc Peter Zijlstra <[email protected]>
Link https://lkml.kernel.org/n/[email protected] open here
Signed-off-by Jiri Olsa <[email protected]>
---
 tools/perf/builtin-top.c | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
tools/perf/builtin-top.c +9 -3
index aad58643102e..50ec01eb7f57 100644
@@ -577,6 +577,12 @@ static void perf_top__sort_new_samples(void *arg)
 	perf_top__reset_sample_counters(t);
 }
 
+static void stop_top(void)
+{
+	session_done = 1;
+	done = 1;
+}
+
 static void *display_thread_tui(void *arg)
 {
 	struct perf_evsel *pos;

@@ -613,13 +619,13 @@ static void *display_thread_tui(void *arg)
 				      !top->record_opts.overwrite,
 				      &top->annotation_opts);
 
-	done = 1;
+	stop_top();
 	return NULL;
 }
 
 static void display_sig(int sig __maybe_unused)
 {
-	done = 1;
+	stop_top();
 }
 
 static void display_setup_sig(void)

@@ -672,7 +678,7 @@ repeat:
 
 			if (perf_top__handle_keypress(top, c))
 				goto repeat;
-			done = 1;
+			stop_top();
 		}
 	}