From 00a17c9765c3ecf1fb8e4e6fefd5547c60abcd72 Mon Sep 17 00:00:00 2001 From: Mathieu Desnoyers Date: Sun, 23 Oct 2011 08:50:13 -0400 Subject: [PATCH] Update UST messages Signed-off-by: Mathieu Desnoyers --- include/lttng-sessiond-comm.h | 4 +++- ltt-sessiond/main.c | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) 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; } -- 2.34.1