From 06f525de3c141168b3bc367a9b87b35d7709abf5 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Mon, 29 Oct 2012 12:02:14 -0400 Subject: [PATCH] Fix: add missing pthread_join in sessiond Signed-off-by: David Goulet --- src/bin/lttng-sessiond/main.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c index 0e20b4f67..cf15ff9b0 100644 --- a/src/bin/lttng-sessiond/main.c +++ b/src/bin/lttng-sessiond/main.c @@ -4076,7 +4076,25 @@ exit_dispatch: goto error; /* join error, exit without cleanup */ } + ret = join_consumer_thread(&ustconsumer32_data); + if (ret != 0) { + PERROR("join_consumer ust32"); + goto error; /* join error, exit without cleanup */ + } + + ret = join_consumer_thread(&ustconsumer64_data); + if (ret != 0) { + PERROR("join_consumer ust64"); + goto error; /* join error, exit without cleanup */ + } + exit_client: + ret = pthread_join(health_thread, &status); + if (ret != 0) { + PERROR("pthread_join health thread"); + goto error; /* join error, exit without cleanup */ + } + exit_health: exit: /* -- 2.34.1