Fix: add missing pthread_join in sessiond
authorDavid Goulet <dgoulet@efficios.com>
Mon, 29 Oct 2012 16:02:14 +0000 (12:02 -0400)
committerDavid Goulet <dgoulet@efficios.com>
Mon, 29 Oct 2012 16:02:14 +0000 (12:02 -0400)
Signed-off-by: David Goulet <dgoulet@efficios.com>
src/bin/lttng-sessiond/main.c

index 0e20b4f67886dc656e88e5631cce8fc223379205..cf15ff9b02a4aec563614c699ec161f221f270ee 100644 (file)
@@ -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:
        /*
This page took 0.039202 seconds and 4 git commands to generate.