X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fust-consumer%2Fust-consumer.cpp;h=3f40d03ed3d846cb8fa95788c94bf555be5fb28f;hb=32670d719327feb585374283a50eeb76ce36b962;hp=00671a876a8bb637d631b58e31d1bb55cd793322;hpb=75f62e5383c6ea1f62fb488a94f4a8f98400db71;p=lttng-tools.git diff --git a/src/common/ust-consumer/ust-consumer.cpp b/src/common/ust-consumer/ust-consumer.cpp index 00671a876..3f40d03ed 100644 --- a/src/common/ust-consumer/ust-consumer.cpp +++ b/src/common/ust-consumer/ust-consumer.cpp @@ -930,7 +930,7 @@ error: */ consumer_stream_destroy(metadata->metadata_stream, nullptr); metadata->metadata_stream = nullptr; - lttng_wait_queue_wake_all(&metadata->metadata_pushed_wait_queue); + metadata->metadata_pushed_wait_queue.wake_all(); send_streams_error: error_no_stream: @@ -1015,7 +1015,7 @@ error_stream: */ consumer_stream_destroy(metadata_stream, nullptr); metadata_channel->metadata_stream = nullptr; - lttng_wait_queue_wake_all(&metadata_channel->metadata_pushed_wait_queue); + metadata_channel->metadata_pushed_wait_queue.wake_all(); error: return ret; @@ -2548,8 +2548,9 @@ static int commit_one_metadata_packet(struct lttng_consumer_stream *stream) ret = write_len; goto end; } + stream->ust_metadata_pushed += write_len; - lttng_wait_queue_wake_all(&stream->chan->metadata_pushed_wait_queue); + stream->chan->metadata_pushed_wait_queue.wake_all(); LTTNG_ASSERT(stream->chan->metadata_cache->contents.size >= stream->ust_metadata_pushed); ret = write_len;