Fix kconsumerd number of fd expected

[lttng-tools.git] / include / lttng-sessiond-comm.h

diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
index d9919add7d491878f76af02ec7578a517ef79efd..7da343a9d899a2509db98cb6caee827523541c39 100644 (file)
--- a/include/lttng-sessiond-comm.h
+++ b/include/lttng-sessiond-comm.h
@@ -38,7 +38,7 @@
 #define DEFAULT_HOME_CLIENT_UNIX_SOCK       "%s/.client-ltt-sessiond"
 
 /* Queue size of listen(2) */
-#define MAX_LISTEN 64
+#define LTTNG_SESSIOND_COMM_MAX_LISTEN 64
 
 /*
  * Get the error code index from 0 since LTTCOMM_OK start at 1000
@@ -119,6 +119,7 @@ enum lttcomm_return_code {
        CONSUMERD_COMMAND_SOCK_READY,           /* when consumerd command socket ready */
        CONSUMERD_SUCCESS_RECV_FD,              /* success on receiving fds */
        CONSUMERD_ERROR_RECV_FD,                /* error on receiving fds */
+       CONSUMERD_ERROR_RECV_CMD,               /* error on receiving command */
        CONSUMERD_POLL_ERROR,                   /* Error in polling thread in kconsumerd */
        CONSUMERD_POLL_NVAL,                    /* Poll on closed fd */
        CONSUMERD_POLL_HUP,                     /* All fds have hungup */
@@ -221,10 +222,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 +246,7 @@ struct lttcomm_ust_reply {
                struct {
                        uint64_t memory_map_size;
                } stream;
+               struct lttng_ust_tracer_version version;
        } u;
 };