X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fconsumer%2Fconsumer-metadata-cache.cpp;h=5e84f2b96f277ca7b80c4144feda327b717c2f99;hb=32670d719327feb585374283a50eeb76ce36b962;hp=462e079d8c705dfb5785244fd67f3cd4b63d5f59;hpb=75f62e5383c6ea1f62fb488a94f4a8f98400db71;p=lttng-tools.git

diff --git a/src/common/consumer/consumer-metadata-cache.cpp b/src/common/consumer/consumer-metadata-cache.cpp
index 462e079d8..5e84f2b96 100644
--- a/src/common/consumer/consumer-metadata-cache.cpp
+++ b/src/common/consumer/consumer-metadata-cache.cpp
@@ -258,18 +258,17 @@ void consumer_wait_metadata_cache_flushed(struct lttng_consumer_channel *channel
 
 	/* Metadata cache is not currently flushed, wait on wait queue. */
 	for (;;) {
-		struct lttng_waiter waiter;
+		lttng::synchro::waiter waiter;
 
-		lttng_waiter_init(&waiter);
-		lttng_wait_queue_add(&channel->metadata_pushed_wait_queue, &waiter);
+		channel->metadata_pushed_wait_queue.add(waiter);
 		if (consumer_metadata_cache_is_flushed(channel, offset, invoked_by_timer)) {
 			/* Wake up all waiters, ourself included. */
-			lttng_wait_queue_wake_all(&channel->metadata_pushed_wait_queue);
+			channel->metadata_pushed_wait_queue.wake_all();
 			/* Ensure proper teardown of waiter. */
-			lttng_waiter_wait(&waiter);
+			waiter.wait();
 			break;
 		}
 
-		lttng_waiter_wait(&waiter);
+		waiter.wait();
 	}
 }