X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-timer.c;h=60ed94083e543a4d082e6f4e700f1ca57662120a;hb=873dda4e25e5199d434d322fb7d64697cd9868d3;hp=55129914ecb15882e3f15a8fb479f701715fb2ca;hpb=0b0ac4a97d325a6938992f5c04987d5d48167a21;p=lttng-tools.git diff --git a/src/common/consumer/consumer-timer.c b/src/common/consumer/consumer-timer.c index 55129914e..60ed94083 100644 --- a/src/common/consumer/consumer-timer.c +++ b/src/common/consumer/consumer-timer.c @@ -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)