Fix: consumer data lock deadlock caused by monitor timer

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

diff --git a/src/common/consumer/consumer-timer.c b/src/common/consumer/consumer-timer.c
index 09cf3629331d344e54c63a6d3b2a467c527cb648..60ed94083e543a4d082e6f4e700f1ca57662120a 100644 (file)
--- a/src/common/consumer/consumer-timer.c
+++ b/src/common/consumer/consumer-timer.c
@@ -21,7 +21,7 @@
 #include <inttypes.h>
 #include <signal.h>
 
-#include <lttng/ust-ctl.h>
+#include <bin/lttng-sessiond/ust-ctl.h>
 #include <bin/lttng-consumerd/health-consumerd.h>
 #include <common/common.h>
 #include <common/compat/endian.h>
@@ -709,10 +709,9 @@ void monitor_timer(struct lttng_consumer_local_data *ctx,
        get_produced_cb get_produced;
 
        assert(channel);
-       pthread_mutex_lock(&consumer_data.lock);
 
        if (channel_monitor_pipe < 0) {
-               goto end;
+               return;
        }
 
        switch (consumer_data.type) {
@@ -734,7 +733,7 @@ void monitor_timer(struct lttng_consumer_local_data *ctx,
        ret = sample_channel_positions(channel, &msg.highest, &msg.lowest,
                        sample, get_consumed, get_produced);
        if (ret) {
-               goto end;
+               return;
        }
 
        /*
@@ -759,8 +758,6 @@ void monitor_timer(struct lttng_consumer_local_data *ctx,
                                ", (highest = %" PRIu64 ", lowest = %"PRIu64")",
                                channel->key, msg.highest, msg.lowest);
        }
-end:
-       pthread_mutex_unlock(&consumer_data.lock);
 }
 
 int consumer_timer_thread_get_channel_monitor_pipe(void)