X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.cpp;fp=src%2Fcommon%2Fust-consumer%2Fust-consumer.cpp;h=051b4a7684c767d0caaae9eaf001b985023ff1c5;hb=7532fa3bd22e403958f46cd35c824f490d93292d;hp=fb40f844ed34370ce262594af15115ed8c9a8d76;hpb=985aea182b618c85c51651f224abedfe367c75ee;p=lttng-tools.git

diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp
index fb40f844e..051b4a768 100644
--- a/src/common/ust-consumer/ust-consumer.cpp
+++ b/src/common/ust-consumer/ust-consumer.cpp
@@ -25,22 +25,22 @@
 #include <stdbool.h>
 #include <stdint.h>
 
-#include <bin/lttng-consumerd/health-consumerd.h>
-#include <common/common.h>
-#include <common/sessiond-comm/sessiond-comm.h>
-#include <common/relayd/relayd.h>
-#include <common/compat/fcntl.h>
-#include <common/compat/endian.h>
-#include <common/consumer/consumer-metadata-cache.h>
-#include <common/consumer/consumer-stream.h>
-#include <common/consumer/consumer-timer.h>
-#include <common/utils.h>
-#include <common/index/index.h>
-#include <common/consumer/consumer.h>
-#include <common/shm.h>
-#include <common/optional.h>
-
-#include "ust-consumer.h"
+#include <bin/lttng-consumerd/health-consumerd.hpp>
+#include <common/common.hpp>
+#include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/relayd/relayd.hpp>
+#include <common/compat/fcntl.hpp>
+#include <common/compat/endian.hpp>
+#include <common/consumer/consumer-metadata-cache.hpp>
+#include <common/consumer/consumer-stream.hpp>
+#include <common/consumer/consumer-timer.hpp>
+#include <common/utils.hpp>
+#include <common/index/index.hpp>
+#include <common/consumer/consumer.hpp>
+#include <common/shm.hpp>
+#include <common/optional.hpp>
+
+#include "ust-consumer.hpp"
 
 #define INT_MAX_STR_LEN 12	/* includes \0 */
 
@@ -3087,13 +3087,13 @@ static int lttng_ustconsumer_set_stream_ops(
 				extract_metadata_subbuffer_info;
 		stream->read_subbuffer_ops.reset_metadata =
 				metadata_stream_reset_cache_consumed_position;
+		ret = consumer_stream_enable_metadata_bucketization(
+				stream);
+		if (ret) {
+			goto end;
+		}
 		if (stream->chan->is_live) {
 			stream->read_subbuffer_ops.on_sleep = signal_metadata;
-			ret = consumer_stream_enable_metadata_bucketization(
-					stream);
-			if (ret) {
-				goto end;
-			}
 		}
 	} else {
 		stream->read_subbuffer_ops.get_next_subbuffer =