X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-timer.cpp;h=8c9371bae780191207c345e3a39184f4b24c97ab;hb=fbd566c25787aa7134e84efcfb7d3569f27d3350;hp=7f88a9712825de9151c4d082f6951ad11e81db1a;hpb=cd9adb8b829564212158943a0d279bb35322ab30;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-timer.cpp b/src/common/consumer/consumer-timer.cpp
index 7f88a9712..8c9371bae 100644
--- a/src/common/consumer/consumer-timer.cpp
+++ b/src/common/consumer/consumer-timer.cpp
@@ -14,6 +14,7 @@
 #include <common/consumer/consumer-timer.hpp>
 #include <common/kernel-consumer/kernel-consumer.hpp>
 #include <common/kernel-ctl/kernel-ctl.hpp>
+#include <common/urcu.hpp>
 #include <common/ust-consumer/ust-consumer.hpp>
 
 #include <bin/lttng-consumerd/health-consumerd.hpp>
@@ -95,7 +96,7 @@ static void metadata_switch_timer(struct lttng_consumer_local_data *ctx, siginfo
 		 * - metadata_socket_lock
 		 *   - Calling lttng_ustconsumer_recv_metadata():
 		 *     - channel->metadata_cache->lock
-		 *     - Calling consumer_metadata_cache_flushed():
+		 *     - Calling consumer_wait_metadata_cache_flushed():
 		 *       - channel->timer_lock
 		 *         - channel->metadata_cache->lock
 		 *
@@ -104,7 +105,7 @@ static void metadata_switch_timer(struct lttng_consumer_local_data *ctx, siginfo
 		 * they are held while consumer_timer_switch_stop() is
 		 * called.
 		 */
-		ret = lttng_ustconsumer_request_metadata(ctx, channel, 1, 1);
+		ret = lttng_ustconsumer_request_metadata(ctx, channel, true, 1);
 		if (ret < 0) {
 			channel->switch_timer_error = 1;
 		}
@@ -282,23 +283,23 @@ static void live_timer(struct lttng_consumer_local_data *ctx, siginfo_t *si)
 
 	DBG("Live timer for channel %" PRIu64, channel->key);
 
-	rcu_read_lock();
-	cds_lfht_for_each_entry_duplicate(ht->ht,
-					  ht->hash_fct(&channel->key, lttng_ht_seed),
-					  ht->match_fct,
-					  &channel->key,
-					  &iter.iter,
-					  stream,
-					  node_channel_id.node)
 	{
-		ret = check_stream(stream, flush_index);
-		if (ret < 0) {
-			goto error_unlock;
+		lttng::urcu::read_lock_guard read_lock;
+		cds_lfht_for_each_entry_duplicate(ht->ht,
+						  ht->hash_fct(&channel->key, lttng_ht_seed),
+						  ht->match_fct,
+						  &channel->key,
+						  &iter.iter,
+						  stream,
+						  node_channel_id.node)
+		{
+			ret = check_stream(stream, flush_index);
+			if (ret < 0) {
+				goto error_unlock;
+			}
 		}
 	}
-
 error_unlock:
-	rcu_read_unlock();
 
 error:
 	return;
@@ -575,7 +576,7 @@ static int sample_channel_positions(struct lttng_consumer_channel *channel,
 
 	*_total_consumed = 0;
 
-	rcu_read_lock();
+	lttng::urcu::read_lock_guard read_lock;
 
 	cds_lfht_for_each_entry_duplicate(ht->ht,
 					  ht->hash_fct(&channel->key, lttng_ht_seed),
@@ -633,7 +634,6 @@ static int sample_channel_positions(struct lttng_consumer_channel *channel,
 	*_highest_use = high;
 	*_lowest_use = low;
 end:
-	rcu_read_unlock();
 	if (empty_channel) {
 		ret = -1;
 	}