Messages in this thread Patch in this message | | | Date | Thu, 14 Aug 2014 01:43:06 -0700 | From | tip-bot for Jiri Olsa <> | Subject | [tip:perf/core] perf top: Join the display thread on exit |
| |
Commit-ID: ae256fa27118e54b0f093f0cfe2ada28f1704ef3 Gitweb: http://git.kernel.org/tip/ae256fa27118e54b0f093f0cfe2ada28f1704ef3 Author: Jiri Olsa <jolsa@kernel.org> AuthorDate: Mon, 11 Aug 2014 10:50:05 +0200 Committer: Arnaldo Carvalho de Melo <acme@redhat.com> CommitDate: Wed, 13 Aug 2014 11:14:21 -0300
perf top: Join the display thread on exit
We create the display thread, but never join it. It gives the display thread a chance to quit and cleanup properly.
Signed-off-by: Jiri Olsa <jolsa@kernel.org> Cc: Adrian Hunter <adrian.hunter@intel.com> Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jean Pihet <jean.pihet@linaro.org> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1407747014-18394-12-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> --- tools/perf/builtin-top.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/perf/builtin-top.c b/tools/perf/builtin-top.c index 4fb6f72..10fc7e8 100644 --- a/tools/perf/builtin-top.c +++ b/tools/perf/builtin-top.c @@ -965,7 +965,7 @@ static int __cmd_top(struct perf_top *top) param.sched_priority = top->realtime_prio; if (sched_setscheduler(0, SCHED_FIFO, ¶m)) { ui__error("Could not set realtime priority.\n"); - goto out_delete; + goto out_join; } } @@ -979,6 +979,8 @@ static int __cmd_top(struct perf_top *top) } ret = 0; +out_join: + pthread_join(thread, NULL); out_delete: perf_session__delete(top->session); top->session = NULL;
| |