X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-metadata-cache.c;h=8ef2848400ee150834daa8a72bfd24a7e676f322;hb=a0377dfefe40662ba7d68617bce6ff467114136c;hp=976c83e54fd5dc6904cb6e72f21ea4af81426d9f;hpb=9eac98281fd4923ea52b94abffd0cf8cfa27588e;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-metadata-cache.c b/src/common/consumer/consumer-metadata-cache.c
index 976c83e54..8ef284840 100644
--- a/src/common/consumer/consumer-metadata-cache.c
+++ b/src/common/consumer/consumer-metadata-cache.c
@@ -7,7 +7,6 @@
  */
 
 #define _LGPL_SOURCE
-#include <assert.h>
 #include <pthread.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,7 +27,7 @@ enum metadata_cache_update_version_status {
 	METADATA_CACHE_UPDATE_STATUS_VERSION_NOT_UPDATED,
 };
 
-extern struct lttng_consumer_global_data consumer_data;
+extern struct lttng_consumer_global_data the_consumer_data;
 
 /*
  * Reset the metadata cache.
@@ -38,7 +37,7 @@ void metadata_cache_reset(struct consumer_metadata_cache *cache)
 {
 	const int ret = lttng_dynamic_buffer_set_size(&cache->contents, 0);
 
-	assert(ret == 0);
+	LTTNG_ASSERT(ret == 0);
 }
 
 /*
@@ -83,7 +82,7 @@ consumer_metadata_cache_write(struct consumer_metadata_cache *cache,
 	bool cache_is_invalidated = false;
 	uint64_t original_size;
 
-	assert(cache);
+	LTTNG_ASSERT(cache);
 	ASSERT_LOCKED(cache->lock);
 	original_size = cache->contents.size;
 
@@ -112,7 +111,7 @@ consumer_metadata_cache_write(struct consumer_metadata_cache *cache,
 		status = CONSUMER_METADATA_CACHE_WRITE_STATUS_APPENDED_CONTENT;
 	} else {
 		status = CONSUMER_METADATA_CACHE_WRITE_STATUS_NO_CHANGE;
-		assert(cache->contents.size == original_size);
+		LTTNG_ASSERT(cache->contents.size == original_size);
 	}
 
 end:
@@ -128,7 +127,7 @@ int consumer_metadata_cache_allocate(struct lttng_consumer_channel *channel)
 {
 	int ret;
 
-	assert(channel);
+	LTTNG_ASSERT(channel);
 
 	channel->metadata_cache = zmalloc(
 			sizeof(struct consumer_metadata_cache));
@@ -196,8 +195,8 @@ int consumer_metadata_cache_flushed(struct lttng_consumer_channel *channel,
 	int ret = 0;
 	struct lttng_consumer_stream *metadata_stream;
 
-	assert(channel);
-	assert(channel->metadata_cache);
+	LTTNG_ASSERT(channel);
+	LTTNG_ASSERT(channel->metadata_cache);
 
 	/*
 	 * If not called from a timer handler, we have to take the