X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-metadata-cache.c;h=5e9dca3ea27bf64fa5987b4e580d6b46c7f168d3;hp=6b15375e19c27d52ae31b991d13bfc6f52838088;hb=e5212a1dde8128fb55fac4308d54cae575b8305e;hpb=5feafd413038626a47de89c0b29e41673b68818a

diff --git a/src/common/consumer/consumer-metadata-cache.c b/src/common/consumer/consumer-metadata-cache.c
index 6b15375e1..5e9dca3ea 100644
--- a/src/common/consumer/consumer-metadata-cache.c
+++ b/src/common/consumer/consumer-metadata-cache.c
@@ -89,7 +89,7 @@ void metadata_cache_reset(struct consumer_metadata_cache *cache)
  */
 static
 int metadata_cache_check_version(struct consumer_metadata_cache *cache,
-		struct lttng_consumer_channel *channel, uint64_t version)
+		uint64_t version)
 {
 	int ret = 0;
 
@@ -105,6 +105,31 @@ end:
 	return ret;
 }
 
+/*
+ * Write a character on the metadata poll pipe to wake the metadata thread.
+ * Returns 0 on success, -1 on error.
+ */
+int consumer_metadata_wakeup_pipe(const struct lttng_consumer_channel *channel)
+{
+	int ret = 0;
+	const char dummy = 'c';
+
+	if (channel->monitor && channel->metadata_stream) {
+		ssize_t write_ret;
+
+		write_ret = lttng_write(channel->metadata_stream->ust_metadata_poll_pipe[1],
+				&dummy, 1);
+		if (write_ret < 1) {
+			PERROR("Wake-up UST metadata pipe");
+			ret = -1;
+			goto end;
+		}
+	}
+
+end:
+	return ret;
+}
+
 /*
  * Write metadata to the cache, extend the cache if necessary. We support
  * overlapping updates, but they need to be contiguous. Send the
@@ -118,7 +143,6 @@ int consumer_metadata_cache_write(struct lttng_consumer_channel *channel,
 		char *data)
 {
 	int ret = 0;
-	int size_ret;
 	struct consumer_metadata_cache *cache;
 
 	assert(channel);
@@ -126,7 +150,7 @@ int consumer_metadata_cache_write(struct lttng_consumer_channel *channel,
 
 	cache = channel->metadata_cache;
 
-	ret = metadata_cache_check_version(cache, channel, version);
+	ret = metadata_cache_check_version(cache, version);
 	if (ret < 0) {
 		goto end;
 	}
@@ -144,18 +168,8 @@ int consumer_metadata_cache_write(struct lttng_consumer_channel *channel,
 
 	memcpy(cache->data + offset, data, len);
 	if (offset + len > cache->max_offset) {
-		char dummy = 'c';
-
 		cache->max_offset = offset + len;
-		if (channel->monitor && channel->metadata_stream) {
-			size_ret = lttng_write(channel->metadata_stream->ust_metadata_poll_pipe[1],
-					&dummy, 1);
-			if (size_ret < 1) {
-				ERR("Wakeup UST metadata pipe");
-				ret = -1;
-				goto end;
-			}
-		}
+		ret = consumer_metadata_wakeup_pipe(channel);
 	}
 
 end: