X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fconsumer.c;h=b1057aaeb139f1fda7681b076a96643f5604ff5f;hp=3fcb528d1c0ca87899d6d6142d57829c84cacee4;hb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;hpb=481d6c57872d621707cf7055432e84a1f54e137b

diff --git a/src/common/consumer.c b/src/common/consumer.c
index 3fcb528d1..b1057aaeb 100644
--- a/src/common/consumer.c
+++ b/src/common/consumer.c
@@ -19,7 +19,6 @@
 
 #define _GNU_SOURCE
 #include <assert.h>
-#include <fcntl.h>
 #include <poll.h>
 #include <pthread.h>
 #include <stdlib.h>
@@ -86,9 +85,18 @@ static void consumer_steal_stream_key(int key)
 {
 	struct lttng_consumer_stream *stream;
 
+	rcu_read_lock();
 	stream = consumer_find_stream(key);
-	if (stream)
+	if (stream) {
 		stream->key = -1;
+		/*
+		 * We don't want the lookup to match, but we still need
+		 * to iterate on this stream when iterating over the hash table. Just
+		 * change the node key.
+		 */
+		stream->node.key = -1;
+	}
+	rcu_read_unlock();
 }
 
 static struct lttng_consumer_channel *consumer_find_channel(int key)
@@ -119,9 +127,18 @@ static void consumer_steal_channel_key(int key)
 {
 	struct lttng_consumer_channel *channel;
 
+	rcu_read_lock();
 	channel = consumer_find_channel(key);
-	if (channel)
+	if (channel) {
 		channel->key = -1;
+		/*
+		 * We don't want the lookup to match, but we still need
+		 * to iterate on this channel when iterating over the hash table. Just
+		 * change the node key.
+		 */
+		channel->node.key = -1;
+	}
+	rcu_read_unlock();
 }
 
 static
@@ -167,15 +184,9 @@ void consumer_del_stream(struct lttng_consumer_stream *stream)
 	}
 
 	rcu_read_lock();
-
-	/* Get stream node from hash table */
-	lttng_ht_lookup(consumer_data.stream_ht,
-			(void *)((unsigned long) stream->key), &iter);
-	/*
-	 * Remove stream node from hash table. It can fail if it's been
-	 * replaced due to key reuse.
-	 */
-	(void) lttng_ht_del(consumer_data.stream_ht, &iter);
+	iter.iter.node = &stream->node.node;
+	ret = lttng_ht_del(consumer_data.stream_ht, &iter);
+	assert(!ret);
 
 	rcu_read_unlock();
 
@@ -293,12 +304,7 @@ int consumer_add_stream(struct lttng_consumer_stream *stream)
 	/* Steal stream identifier, for UST */
 	consumer_steal_stream_key(stream->key);
 	rcu_read_lock();
-	/*
-	 * We simply remove the old channel from the hash table. It's
-	 * ok, since we know for sure the sessiond wants to replace it
-	 * with the new version, because the key has been reused.
-	 */
-	(void) lttng_ht_add_replace_ulong(consumer_data.stream_ht, &stream->node);
+	lttng_ht_add_unique_ulong(consumer_data.stream_ht, &stream->node);
 	rcu_read_unlock();
 	consumer_data.stream_count++;
 	consumer_data.need_update = 1;
@@ -376,16 +382,9 @@ void consumer_del_channel(struct lttng_consumer_channel *channel)
 	}
 
 	rcu_read_lock();
-
-	lttng_ht_lookup(consumer_data.channel_ht,
-			(void *)((unsigned long) channel->key), &iter);
-
-	/*
-	 * Remove channel node from hash table. It can fail if it's been
-	 * replaced due to key reuse.
-	 */
-	(void) lttng_ht_del(consumer_data.channel_ht, &iter);
-
+	iter.iter.node = &channel->node.node;
+	ret = lttng_ht_del(consumer_data.channel_ht, &iter);
+	assert(!ret);
 	rcu_read_unlock();
 
 	if (channel->mmap_base != NULL) {
@@ -472,12 +471,7 @@ int consumer_add_channel(struct lttng_consumer_channel *channel)
 	/* Steal channel identifier, for UST */
 	consumer_steal_channel_key(channel->key);
 	rcu_read_lock();
-	/*
-	 * We simply remove the old channel from the hash table. It's
-	 * ok, since we know for sure the sessiond wants to replace it
-	 * with the new version, because the key has been reused.
-	 */
-	(void) lttng_ht_add_replace_ulong(consumer_data.channel_ht, &channel->node);
+	lttng_ht_add_unique_ulong(consumer_data.channel_ht, &channel->node);
 	rcu_read_unlock();
 	pthread_mutex_unlock(&consumer_data.lock);
 
@@ -646,7 +640,7 @@ void lttng_consumer_sync_trace_file(
 	if (orig_offset < stream->chan->max_sb_size) {
 		return;
 	}
-	sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
+	lttng_sync_file_range(outfd, orig_offset - stream->chan->max_sb_size,
 			stream->chan->max_sb_size,
 			SYNC_FILE_RANGE_WAIT_BEFORE
 			| SYNC_FILE_RANGE_WRITE
@@ -814,6 +808,8 @@ ssize_t lttng_consumer_on_read_subbuffer_mmap(
 		ERR("Unknown consumer_data type");
 		assert(0);
 	}
+
+	return 0;
 }
 
 /*
@@ -1037,8 +1033,6 @@ void *lttng_consumer_thread_poll_fds(void *data)
 					local_stream[i]->hangup_flush_done) {
 				ssize_t len;
 
-				assert(!(pollfd[i].revents & POLLERR));
-				assert(!(pollfd[i].revents & POLLNVAL));
 				DBG("Normal read on fd %d", pollfd[i].fd);
 				len = ctx->on_buffer_ready(local_stream[i], ctx);
 				/* it's ok to have an unavailable sub-buffer */