X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer.cpp;h=5730fd45c28dfc97438bda6774af69950f348758;hb=21cf9b6b1843774306a76f4dccddddd706b64f79;hp=47bb5bd98b1a1fbf0c10a8795672ca1af0a556e9;hpb=97535efaa975ca52bf02c2d5e76351bfd2e3defa;p=lttng-tools.git

diff --git a/src/common/consumer/consumer.cpp b/src/common/consumer/consumer.cpp
index 47bb5bd98..5730fd45c 100644
--- a/src/common/consumer/consumer.cpp
+++ b/src/common/consumer/consumer.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011 Julien Desfossez <julien.desfossez@polymtl.ca>
+ * Copyright (C) 2011 EfficiOS Inc.
  * Copyright (C) 2011 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  * Copyright (C) 2012 David Goulet <dgoulet@efficios.com>
  *
@@ -3381,6 +3381,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) {