X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fkernel-consumer%2Fkernel-consumer.c;h=196deee9a153e521447703915d9ee9d2790502a4;hb=4e9a468645939ea62541fa802893b928b01888b7;hp=249df8a47bc4789ae9aedee05300e248c52e926e;hpb=8994307fa7ccf9b61cc0157f2c5d34e248c56641;p=lttng-tools.git

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 249df8a47..196deee9a 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -485,7 +485,8 @@ error:
 
 /*
  * Check if data is still being extracted from the buffers for a specific
- * stream. Consumer data lock MUST be acquired before calling this function.
+ * stream. Consumer data lock MUST be acquired before calling this function
+ * and the stream lock.
  *
  * Return 0 if the traced data are still getting read else 1 meaning that the
  * data is available for trace viewer reading.
@@ -496,31 +497,17 @@ int lttng_kconsumer_data_available(struct lttng_consumer_stream *stream)
 
 	assert(stream);
 
-	/*
-	 * Try to lock the stream mutex. On failure, we know that the stream is
-	 * being used else where hence there is data still being extracted.
-	 */
-	ret = pthread_mutex_trylock(&stream->lock);
-	if (ret == EBUSY) {
-		/* Data not available */
-		ret = 0;
-		goto end;
-	}
-	/* The stream is now locked so we can do our ustctl calls */
-
 	ret = kernctl_get_next_subbuf(stream->wait_fd);
 	if (ret == 0) {
 		/* There is still data so let's put back this subbuffer. */
 		ret = kernctl_put_subbuf(stream->wait_fd);
 		assert(ret == 0);
-		goto end_unlock;
+		goto end;
 	}
 
 	/* Data is available to be read for this stream. */
 	ret = 1;
 
-end_unlock:
-	pthread_mutex_unlock(&stream->lock);
 end:
 	return ret;
 }