X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.h;h=4e86cc5475b6a11804079ac3344a453e61a8a6d6;hp=adb9a8d843572d96f62938d02daf0ea111599c89;hb=1df4dedd9ed4253a944a1623bb40047ba599e0c4;hpb=5e16da05d15eb413f28dea441e1bc49809cddc9b

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index adb9a8d84..4e86cc547 100644
--- a/liblttsessiondcomm/liblttsessiondcomm.h
+++ b/liblttsessiondcomm/liblttsessiondcomm.h
@@ -24,10 +24,7 @@
 #include <limits.h>
 #include <uuid/uuid.h>
 
-/*
- * FIXME: 32, 64bit enums -> uint32_t uint64_t for data exchange.
- * Same for pid_t.
- */
+#include "lttng-share.h"
 
 #define LTTNG_RUNDIR						"/var/run/lttng"
 
@@ -51,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,
@@ -97,6 +100,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 */
@@ -114,55 +126,45 @@ enum lttcomm_kconsumerd_fd_state {
 };
 
 /*
- * Data structure for ltt-session received message
+ * Data structure received from lttng client to session daemon.
  */
 struct lttcomm_session_msg {
-	/* Common data to almost all command */
-	enum lttcomm_sessiond_command cmd_type;
-	uuid_t session_id;
+	u32 cmd_type;    /* enum lttcomm_sessiond_command */
+	uuid_t session_uuid;
 	char trace_name[NAME_MAX];
 	char session_name[NAME_MAX];
-	pid_t pid;
+	u32 pid;    /* pid_t */
 	union {
 		struct {
 			int auto_session;
 		} 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 */
+			char event_name[NAME_MAX];
+		} event;
+		/* Create channel kernel */
 		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;
+			int overwrite;
+			u64 subbuf_size;
+			u64 num_subbuf;
+			unsigned int switch_timer_interval;
+			unsigned int read_timer_interval;
+		} create_channel;
 	} u;
 };
 
 /*
  * Data structure for the response from sessiond to the lttng client.
- *
- * This data structure is the control struct use in
- * the header of the transmission. NEVER put variable
- * size data in here.
  */
-struct lttcomm_lttng_header {
-	enum lttcomm_sessiond_command cmd_type;
-	enum lttcomm_return_code ret_code;
-	uuid_t session_id;
-	pid_t pid;
-	char trace_name[NAME_MAX];
-	unsigned int payload_size;
+struct lttcomm_lttng_msg {
+	u32 cmd_type;   /* enum lttcomm_sessiond_command */
+	u32 ret_code;   /* enum lttcomm_return_code */
+	u32 pid;        /* pid_t */
+	u32 trace_name_offset;
+	u32 data_size;
+	uuid_t session_uuid;
+	/* Contains: trace_name + data */
+	char payload[];
 };
 
 /*
@@ -172,9 +174,9 @@ struct lttcomm_lttng_header {
  * how many lttcomm_kconsumerd_msg it is about to receive
  */
 struct lttcomm_kconsumerd_header {
-	unsigned int payload_size;
-	enum lttcomm_consumerd_command cmd_type;
-	enum lttcomm_return_code ret_code;
+	u32 payload_size;
+	u32 cmd_type;	/* enum lttcomm_consumerd_command */
+	u32 ret_code;	/* enum lttcomm_return_code */
 };
 
 /* lttcomm_kconsumerd_msg represents a file descriptor to consume the
@@ -183,7 +185,8 @@ struct lttcomm_kconsumerd_header {
 struct lttcomm_kconsumerd_msg {
 	char path_name[PATH_MAX];
 	int fd;
-	enum lttcomm_kconsumerd_fd_state state;
+	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);