Fix: consumer should await for initial streams

[lttng-tools.git] / src / bin / lttng-sessiond / ust-consumer.c

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index aabe49403fbc1215d423986cb7dfa71301da2a47..44913cb8fcb763b40b49bc2dc6466d9bd6cef721 100644 (file)
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -52,7 +52,8 @@ static int send_channel(int sock, struct ust_app_channel *uchan)
                        uchan->obj->shm_fd,
                        uchan->attr.subbuf_size,
                        uchan->obj->memory_map_size,
                        uchan->obj->shm_fd,
                        uchan->attr.subbuf_size,
                        uchan->obj->memory_map_size,

-                       uchan->name);
+                       uchan->name,
+                       uchan->streams.count);

 
        ret = consumer_send_channel(sock, &msg);
        if (ret < 0) {
 
        ret = consumer_send_channel(sock, &msg);
        if (ret < 0) {


@@ -208,7 +209,8 @@ static int send_metadata(int sock, struct ust_app_session *usess,
                        usess->metadata->obj->shm_fd,
                        usess->metadata->attr.subbuf_size,
                        usess->metadata->obj->memory_map_size,
                        usess->metadata->obj->shm_fd,
                        usess->metadata->attr.subbuf_size,
                        usess->metadata->obj->memory_map_size,

-                       "metadata");
+                       "metadata",
+                       1);

 
        ret = consumer_send_channel(sock, &msg);
        if (ret < 0) {
 
        ret = consumer_send_channel(sock, &msg);
        if (ret < 0) {