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

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index a1960a940..8e6a862ef 100644
--- a/liblttsessiondcomm/liblttsessiondcomm.h
+++ b/liblttsessiondcomm/liblttsessiondcomm.h
@@ -48,6 +48,12 @@
 #define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
 
 enum lttcomm_sessiond_command {
+	KERNEL_CREATE_CHANNEL,
+	KERNEL_CREATE_SESSION,
+	KERNEL_DISABLE_EVENT,
+	KERNEL_ENABLE_EVENT,
+	KERNEL_START_TRACE,
+	KERNEL_STOP_TRACE,
 	LTTNG_CREATE_SESSION,
 	LTTNG_DESTROY_SESSION,
 	LTTNG_FORCE_SUBBUF_SWITCH,
@@ -76,24 +82,38 @@ enum lttcomm_sessiond_command {
  * lttcomm error code.
  */
 enum lttcomm_return_code {
-	LTTCOMM_OK = 1000,		/* Ok */
-	LTTCOMM_ERR,			/* Unknown Error */
-	LTTCOMM_UND,			/* Undefine command */
-	LTTCOMM_ALLOC_FAIL,		/* Trace allocation fail */
-	LTTCOMM_NO_SESSION,		/* No session found */
-	LTTCOMM_CREATE_FAIL,	/* Create trace fail */
-	LTTCOMM_SESSION_FAIL,	/* Create session fail */
-	LTTCOMM_START_FAIL,		/* Start tracing fail */
-	LTTCOMM_STOP_FAIL,		/* Stop tracing fail */
-	LTTCOMM_LIST_FAIL,		/* Listing apps fail */
-	LTTCOMM_NO_APPS,		/* No traceable application */
-	LTTCOMM_NO_SESS,		/* No sessions available */
-	LTTCOMM_NO_TRACE,		/* No trace exist */
-	LTTCOMM_FATAL,			/* Session daemon had a fatal error */
-	LTTCOMM_NO_TRACEABLE,	/* Error for non traceable app */
-	LTTCOMM_SELECT_SESS,	/* Must select a session */
-	LTTCOMM_EXIST_SESS,		/* Session name already exist */
-	LTTCOMM_NR,				/* Last element */
+	LTTCOMM_OK = 1000,				/* Ok */
+	LTTCOMM_ERR,					/* Unknown Error */
+	LTTCOMM_UND,					/* Undefine command */
+	LTTCOMM_ALLOC_FAIL,				/* Trace allocation fail */
+	LTTCOMM_NO_SESSION,				/* No session found */
+	LTTCOMM_CREATE_FAIL,			/* Create trace fail */
+	LTTCOMM_SESSION_FAIL,			/* Create session fail */
+	LTTCOMM_START_FAIL,				/* Start tracing fail */
+	LTTCOMM_STOP_FAIL,				/* Stop tracing fail */
+	LTTCOMM_LIST_FAIL,				/* Listing apps fail */
+	LTTCOMM_NO_APPS,				/* No traceable application */
+	LTTCOMM_NO_SESS,				/* No sessions available */
+	LTTCOMM_NO_TRACE,				/* No trace exist */
+	LTTCOMM_FATAL,					/* Session daemon had a fatal error */
+	LTTCOMM_NO_TRACEABLE,			/* Error for non traceable app */
+	LTTCOMM_SELECT_SESS,			/* Must select a session */
+	LTTCOMM_EXIST_SESS,				/* Session name already exist */
+	LTTCOMM_NO_EVENT,				/* No event found */
+	LTTCOMM_KERN_NA,				/* Kernel tracer unavalable */
+	LTTCOMM_KERN_SESS_FAIL,			/* Kernel create session failed */
+	LTTCOMM_KERN_CHAN_FAIL,			/* Kernel create channel failed */
+	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 */
+	/* MUST be last element */
+	LTTCOMM_NR,						/* Last element */
 };
 
 /* commands for kconsumerd */
@@ -115,7 +135,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 */
@@ -125,36 +145,23 @@ struct lttcomm_session_msg {
 		} create_session;
 		/* Marker data */
 		struct {
-			char channel[NAME_MAX];
-			char marker[NAME_MAX];
-		} marker;
-		/* SET_SOCK_PATH */
-		struct {
-			char sock_path[PATH_MAX];
-		} sock_path;
-		/* SET_SUBBUF_NUM */
-		struct {
-			unsigned int subbuf_num;
-			char channel[NAME_MAX];
-		} subbuf_num;
-		/* SET_SUBBUF_SIZE */
-		struct {
-			unsigned int subbuf_size;
-			char channel[NAME_MAX];
-		} subbuf_size;
+			char event_name[NAME_MAX];
+		} event;
 	} u;
 };
 
 /*
  * 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 +183,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);