From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Sun, 23 Oct 2011 12:50:13 +0000 (-0400)
Subject: Update UST messages
X-Git-Tag: v2.0-pre15~188
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=00a17c9765c3ecf1fb8e4e6fefd5547c60abcd72

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 d9919add7..60005ac5e 100644
--- 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 5fec7ae4e..4da4cfbc1 100644
--- 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;
 			}