Update UST messages

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
index d9919add7d491878f76af02ec7578a517ef79efd..60005ac5e7d0552f350a1a978ef19c99534647f9 100644 (file)
--- a/include/lttng-sessiond-comm.h
+++ b/include/lttng-sessiond-comm.h
@@ -221,10 +221,11 @@ struct lttcomm_ust_msg {
        uint32_t handle;
        uint32_t cmd;
        union {
-               struct lttng_ust_tracer_version version;
                struct lttng_ust_channel channel;
+               struct lttng_ust_stream stream;
                struct lttng_ust_event event;
                struct lttng_ust_context context;
+               struct lttng_ust_tracer_version version;
        } u;
 };
 
@@ -244,6 +245,7 @@ struct lttcomm_ust_reply {
                struct {
                        uint64_t memory_map_size;
                } stream;
+               struct lttng_ust_tracer_version version;
        } u;
 };
 

diff --git a/ltt-sessiond/main.c b/ltt-sessiond/main.c
index 5fec7ae4e8cc2f3070ad5e151cd40d9d8a2c857d..4da4cfbc1fa324d68fcb97dfac09ecfde249c9f9 100644 (file)
--- a/ltt-sessiond/main.c
+++ b/ltt-sessiond/main.c
@@ -1100,7 +1100,7 @@ static void *thread_dispatch_ust_registration(void *data)
                        /* Dequeue command for registration */
                        node = cds_wfq_dequeue_blocking(&ust_cmd_queue.queue);
                        if (node == NULL) {
-                               DBG("Waked up but nothing in the UST command queue");
+                               DBG("Woken up but nothing in the UST command queue");
                                /* Continue thread execution */
                                break;
                        }