X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.h;h=8b505eb980f3ea6782ec0cef60083c2f2549f4d0;hp=a1960a94018f95178765ed922118a46c0431756c;hb=d4a1283e471c152cedf6cb5ebcc74d509009145d;hpb=9bda164defe0c7ef5857d4ef59cc3b464f5a5404

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index a1960a940..8b505eb98 100644
--- a/liblttsessiondcomm/liblttsessiondcomm.h
+++ b/liblttsessiondcomm/liblttsessiondcomm.h
@@ -94,6 +94,15 @@ enum lttcomm_return_code {
 	LTTCOMM_SELECT_SESS,	/* Must select a session */
 	LTTCOMM_EXIST_SESS,		/* Session name already exist */
 	LTTCOMM_NR,				/* Last element */
+	KCONSUMERD_COMMAND_SOCK_READY,	/* when kconsumerd command socket ready */
+	KCONSUMERD_SUCCESS_RECV_FD,	/* success on receiving fds */
+	KCONSUMERD_ERROR_RECV_FD,	/* error on receiving fds */
+	KCONSUMERD_POLL_ERROR,	/* Error in polling thread in kconsumerd */
+	KCONSUMERD_POLL_NVAL,	/* Poll on closed fd */
+	KCONSUMERD_POLL_HUP,	/* All fds have hungup */
+	KCONSUMERD_EXIT_SUCCESS,	/* kconsumerd exiting normally */
+	KCONSUMERD_EXIT_FAILURE,	/* kconsumerd exiting on error */
+	KCONSUMERD_OUTFD_ERROR,	/* error opening the tracefile */
 };
 
 /* commands for kconsumerd */
@@ -115,7 +124,7 @@ enum lttcomm_kconsumerd_fd_state {
  */
 struct lttcomm_session_msg {
 	u32 cmd_type;    /* enum lttcomm_sessiond_command */
-	uuid_t session_id;
+	uuid_t session_uuid;
 	char trace_name[NAME_MAX];
 	char session_name[NAME_MAX];
 	u32 pid;    /* pid_t */
@@ -148,13 +157,15 @@ struct lttcomm_session_msg {
 /*
  * Data structure for the response from sessiond to the lttng client.
  */
-struct lttcomm_lttng_header {
+struct lttcomm_lttng_msg {
 	u32 cmd_type;   /* enum lttcomm_sessiond_command */
 	u32 ret_code;   /* enum lttcomm_return_code */
 	u32 pid;        /* pid_t */
-	u32 payload_size;
-	uuid_t session_id;
-	char trace_name[NAME_MAX];
+	u32 trace_name_offset;
+	u32 data_size;
+	uuid_t session_uuid;
+	/* Contains: trace_name + data */
+	char payload[];
 };
 
 /*
@@ -176,6 +187,7 @@ struct lttcomm_kconsumerd_msg {
 	char path_name[PATH_MAX];
 	int fd;
 	u32 state;    /* enum lttcomm_kconsumerd_fd_state */
+	unsigned long max_sb_size; /* the subbuffer size for this channel */
 };
 
 extern int lttcomm_create_unix_sock(const char *pathname);