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

diff --git a/src/common/consumer/consumer-metadata-cache.c b/src/common/consumer/consumer-metadata-cache.c
index 6b15375e1..84f930a84 100644
--- a/src/common/consumer/consumer-metadata-cache.c
+++ b/src/common/consumer/consumer-metadata-cache.c
@@ -33,6 +33,11 @@
 
 #include "consumer-metadata-cache.h"
 
+enum metadata_cache_update_version_status {
+	METADATA_CACHE_UPDATE_STATUS_VERSION_UPDATED,
+	METADATA_CACHE_UPDATE_STATUS_VERSION_NOT_UPDATED,
+};
+
 extern struct lttng_consumer_global_data consumer_data;
 
 /*
@@ -84,25 +89,23 @@ void metadata_cache_reset(struct consumer_metadata_cache *cache)
  * Check if the metadata cache version changed.
  * If it did, reset the metadata cache.
  * The metadata cache lock MUST be held.
- *
- * Returns 0 on success, a negative value on error.
  */
-static
-int metadata_cache_check_version(struct consumer_metadata_cache *cache,
-		struct lttng_consumer_channel *channel, uint64_t version)
+static enum metadata_cache_update_version_status metadata_cache_update_version(
+		struct consumer_metadata_cache *cache, uint64_t version)
 {
-	int ret = 0;
+	enum metadata_cache_update_version_status status;
 
 	if (cache->version == version) {
+		status = METADATA_CACHE_UPDATE_STATUS_VERSION_NOT_UPDATED;
 		goto end;
 	}
 
 	DBG("Metadata cache version update to %" PRIu64, version);
-	metadata_cache_reset(cache);
 	cache->version = version;
+	status = METADATA_CACHE_UPDATE_STATUS_VERSION_UPDATED;
 
 end:
-	return ret;
+	return status;
 }
 
 /*
@@ -111,24 +114,31 @@ end:
  * contiguous metadata in cache to the ring buffer. The metadata cache
  * lock MUST be acquired to write in the cache.
  *
- * Return 0 on success, a negative value on error.
+ * See `enum consumer_metadata_cache_write_status` for the meaning of the
+ * various returned status codes.
  */
-int consumer_metadata_cache_write(struct lttng_consumer_channel *channel,
+enum consumer_metadata_cache_write_status
+consumer_metadata_cache_write(struct lttng_consumer_channel *channel,
 		unsigned int offset, unsigned int len, uint64_t version,
 		char *data)
 {
 	int ret = 0;
-	int size_ret;
 	struct consumer_metadata_cache *cache;
+	enum consumer_metadata_cache_write_status status;
+	bool cache_is_invalidated = false;
+	uint64_t original_max_offset;
 
 	assert(channel);
 	assert(channel->metadata_cache);
 
 	cache = channel->metadata_cache;
+	ASSERT_LOCKED(cache->lock);
+	original_max_offset = cache->max_offset;
 
-	ret = metadata_cache_check_version(cache, channel, version);
-	if (ret < 0) {
-		goto end;
+	if (metadata_cache_update_version(cache, version) ==
+			METADATA_CACHE_UPDATE_STATUS_VERSION_UPDATED) {
+		metadata_cache_reset(cache);
+		cache_is_invalidated = true;
 	}
 
 	DBG("Writing %u bytes from offset %u in metadata cache", len, offset);
@@ -138,28 +148,25 @@ int consumer_metadata_cache_write(struct lttng_consumer_channel *channel,
 				len - cache->cache_alloc_size + offset);
 		if (ret < 0) {
 			ERR("Extending metadata cache");
+			status = CONSUMER_METADATA_CACHE_WRITE_STATUS_ERROR;
 			goto end;
 		}
 	}
 
 	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;
-			}
-		}
+	cache->max_offset = max(cache->max_offset, offset + len);
+
+	if (cache_is_invalidated) {
+		status = CONSUMER_METADATA_CACHE_WRITE_STATUS_INVALIDATED;
+	} else if (cache->max_offset > original_max_offset) {
+		status = CONSUMER_METADATA_CACHE_WRITE_STATUS_APPENDED_CONTENT;
+	} else {
+		status = CONSUMER_METADATA_CACHE_WRITE_STATUS_NO_CHANGE;
+		assert(cache->max_offset == original_max_offset);
 	}
 
 end:
-	return ret;
+	return status;
 }
 
 /*
@@ -249,17 +256,20 @@ int consumer_metadata_cache_flushed(struct lttng_consumer_channel *channel,
 		pthread_mutex_lock(&channel->lock);
 	}
 	pthread_mutex_lock(&channel->timer_lock);
-	pthread_mutex_lock(&channel->metadata_cache->lock);
-
 	metadata_stream = channel->metadata_stream;
-
 	if (!metadata_stream) {
 		/*
 		 * Having no metadata stream means the channel is being destroyed so there
 		 * is no cache to flush anymore.
 		 */
 		ret = 0;
-	} else if (metadata_stream->ust_metadata_pushed >= offset) {
+		goto end_unlock_channel;
+	}
+
+	pthread_mutex_lock(&metadata_stream->lock);
+	pthread_mutex_lock(&channel->metadata_cache->lock);
+
+	if (metadata_stream->ust_metadata_pushed >= offset) {
 		ret = 0;
 	} else if (channel->metadata_stream->endpoint_status !=
 			CONSUMER_ENDPOINT_ACTIVE) {
@@ -271,6 +281,8 @@ int consumer_metadata_cache_flushed(struct lttng_consumer_channel *channel,
 	}
 
 	pthread_mutex_unlock(&channel->metadata_cache->lock);
+	pthread_mutex_unlock(&metadata_stream->lock);
+end_unlock_channel:
 	pthread_mutex_unlock(&channel->timer_lock);
 	if (!timer) {
 		pthread_mutex_unlock(&channel->lock);