Fix: relayd: erroneous rundir permission logging message

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

diff --git a/src/common/consumer/consumer.c b/src/common/consumer/consumer.c
index 4519944e851f10e4f04e083a73302349eb51feae..ec6af8cc14926876dc7621117b888cc4087752ad 100644 (file)
--- a/src/common/consumer/consumer.c
+++ b/src/common/consumer/consumer.c
@@ -3386,6 +3386,8 @@ ssize_t lttng_consumer_read_subbuffer(struct lttng_consumer_stream *stream,
 
        if (!locked_by_caller) {
                stream->read_subbuffer_ops.lock(stream);
+       } else {
+               stream->read_subbuffer_ops.assert_locked(stream);
        }
 
        if (stream->read_subbuffer_ops.on_wake_up) {
@@ -4399,7 +4401,11 @@ int consumer_clear_buffer(struct lttng_consumer_stream *stream)
                break;
        case LTTNG_CONSUMER32_UST:
        case LTTNG_CONSUMER64_UST:
-               lttng_ustconsumer_clear_buffer(stream);
+               ret = lttng_ustconsumer_clear_buffer(stream);
+               if (ret < 0) {
+                       ERR("Failed to clear ust stream (ret = %d)", ret);
+                       goto end;
+               }
                break;
        default:
                ERR("Unknown consumer_data type");
@@ -5249,3 +5255,8 @@ error_unlock:
        pthread_mutex_unlock(&stream->lock);
        goto end_rcu_unlock;
 }
+
+void lttng_consumer_sigbus_handle(void *addr)
+{
+       lttng_ustconsumer_sigbus_handle(addr);
+}