Missing error handling: consumer_signal_init should return its error status

[lttng-tools.git] / src / common / consumer-timer.c

diff --git a/src/common/consumer-timer.c b/src/common/consumer-timer.c
index d36e2bccfdd08cb304d2d362403325db85c4c3af..646d32342cdfa0a7a7552332dd3f5da2c90cc680 100644 (file)
--- a/src/common/consumer-timer.c
+++ b/src/common/consumer-timer.c
@@ -17,6 +17,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <inttypes.h>
 #include <signal.h>
@@ -27,7 +28,6 @@
 #include <common/kernel-ctl/kernel-ctl.h>
 #include <common/kernel-consumer/kernel-consumer.h>
 #include <common/consumer-stream.h>
-#include <lttng/ust-ctl.h>
 
 #include "consumer-timer.h"
 #include "consumer-testpoint.h"
@@ -214,7 +214,7 @@ static int check_ust_stream(struct lttng_consumer_stream *stream)
                        ret = -1;
                        goto error_unlock;
                }
-               ret = ustctl_get_stream_id(stream->ustream, &stream_id);
+               ret = lttng_ustconsumer_get_stream_id(stream, &stream_id);
                if (ret < 0) {
                        PERROR("ustctl_get_stream_id");
                        goto error_unlock;
@@ -460,7 +460,7 @@ void consumer_timer_live_stop(struct lttng_consumer_channel *channel)
  * Block the RT signals for the entire process. It must be called from the
  * consumer main before creating the threads
  */
-void consumer_signal_init(void)
+int consumer_signal_init(void)
 {
        int ret;
        sigset_t mask;
@@ -471,7 +471,9 @@ void consumer_signal_init(void)
        if (ret) {
                errno = ret;
                PERROR("pthread_sigmask");
+               return -1;
        }
+       return 0;
 }
 
 /*