X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=include%2Flttng-sessiond-comm.h;h=f30bf6673d599610b818adcd6c2c4291f7a8dd6b;hp=d9919add7d491878f76af02ec7578a517ef79efd;hb=f6a9efaa0fe496b7fa4850daa2eae98a240433e1;hpb=3bd1e0819b577ffcb44acd7c2f8e02ff09654b7b

diff --git a/include/lttng-sessiond-comm.h b/include/lttng-sessiond-comm.h
index d9919add7..f30bf6673 100644
--- 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
@@ -114,11 +114,28 @@ enum lttcomm_return_code {
 	LTTCOMM_KERN_NO_SESSION,		/* No kernel session found */
 	LTTCOMM_KERN_LIST_FAIL,			/* Kernel listing events failed */
 	LTTCOMM_UST_SESS_FAIL,			/* UST create session failed */
+	LTTCOMM_UST_CHAN_EXIST,         /* UST channel already exist */
+	LTTCOMM_UST_CHAN_FAIL,			/* UST create channel failed */
 	LTTCOMM_UST_CHAN_NOT_FOUND,     /* UST channel not found */
-	LTTCOMM_UST_CHAN_FAIL,          /* UST create channel failed */
+	LTTCOMM_UST_CHAN_DISABLE_FAIL, /* UST disable channel failed */
+	LTTCOMM_UST_CHAN_ENABLE_FAIL,  /* UST enable channel failed */
+	LTTCOMM_UST_CONTEXT_FAIL,      /* UST add context failed */
+	LTTCOMM_UST_ENABLE_FAIL,		/* UST enable event failed */
+	LTTCOMM_UST_DISABLE_FAIL,		/* UST disable event failed */
+	LTTCOMM_UST_META_FAIL,			/* UST open metadata failed */
+	LTTCOMM_UST_START_FAIL,		/* UST start trace failed */
+	LTTCOMM_UST_STOP_FAIL,			/* UST stop trace failed */
+	LTTCOMM_UST_CONSUMER_FAIL,		/* UST consumer start failed */
+	LTTCOMM_UST_STREAM_FAIL,		/* UST create stream failed */
+	LTTCOMM_UST_DIR_FAIL,			/* UST trace directory creation failed */
+	LTTCOMM_UST_DIR_EXIST,			/* UST trace directory exist */
+	LTTCOMM_UST_NO_SESSION,		/* No UST session found */
+	LTTCOMM_UST_LIST_FAIL,			/* UST listing events failed */
+
 	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 +238,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 +262,7 @@ struct lttcomm_ust_reply {
 		struct {
 			uint64_t memory_map_size;
 		} stream;
+		struct lttng_ust_tracer_version version;
 	} u;
 };