X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.h;h=a2185f911559b2a24801780ba88efaed38a32fce;hp=d63f9b62cc89334edc01036ec4e310df89dcfe27;hb=508f6562a0a21bebcd6412eb0cf8761d359c3ee4;hpb=5dc1855009c9b215a108bc56e7df64d9862c8144

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index d63f9b62c..a2185f911 100644
--- a/liblttsessiondcomm/liblttsessiondcomm.h
+++ b/liblttsessiondcomm/liblttsessiondcomm.h
@@ -22,8 +22,8 @@
 #define _LIBLTTSESSIONDCOMM_H
 
 #include <limits.h>
-#include <uuid/uuid.h>
 
+#include <lttng/lttng.h>
 #include "lttng-share.h"
 
 /* Default unix socket path */
@@ -41,36 +41,25 @@
 #define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK)
 
 enum lttcomm_sessiond_command {
-	KERNEL_CREATE_CHANNEL,
-	KERNEL_CREATE_SESSION,
-	KERNEL_CREATE_STREAM,
-	KERNEL_DISABLE_EVENT,
-	KERNEL_ENABLE_EVENT,
-	KERNEL_OPEN_METADATA,
-	KERNEL_START_TRACE,
-	KERNEL_STOP_TRACE,
+	/* Tracer context command */
+	LTTNG_KERNEL_ADD_CONTEXT,
+	LTTNG_KERNEL_CREATE_CHANNEL,
+	LTTNG_KERNEL_DISABLE_CHANNEL,
+	LTTNG_KERNEL_DISABLE_EVENT,
+	LTTNG_KERNEL_DISABLE_ALL_EVENT,
+	LTTNG_KERNEL_ENABLE_CHANNEL,
+	LTTNG_KERNEL_ENABLE_EVENT,
+	LTTNG_KERNEL_ENABLE_ALL_EVENT,
+	LTTNG_KERNEL_LIST_EVENTS,
+	/* Session daemon context command */
 	LTTNG_CREATE_SESSION,
 	LTTNG_DESTROY_SESSION,
-	LTTNG_FORCE_SUBBUF_SWITCH,
-	LTTNG_GET_ALL_SESSION,
-	LTTNG_GET_SOCK_PATH,
-	LTTNG_GET_SUBBUF_NUM_SIZE,
-	LTTNG_LIST_MARKERS,
 	LTTNG_LIST_SESSIONS,
 	LTTNG_LIST_TRACES,
-	LTTNG_LIST_TRACE_EVENTS,
-	LTTNG_SETUP_TRACE,
-	LTTNG_SET_SOCK_PATH,
-	LTTNG_SET_SUBBUF_NUM,
-	LTTNG_SET_SUBBUF_SIZE,
-	UST_ALLOC_TRACE,
-	UST_CREATE_TRACE,
-	UST_DESTROY_TRACE,
-	UST_DISABLE_MARKER,
-	UST_ENABLE_MARKER,
-	UST_LIST_APPS,
-	UST_START_TRACE,
-	UST_STOP_TRACE,
+	LTTNG_LIST_EVENTS,
+	LTTNG_LIST_TRACEABLE_APPS,
+	LTTNG_START_TRACE,
+	LTTNG_STOP_TRACE,
 };
 
 /*
@@ -88,7 +77,7 @@ enum lttcomm_return_code {
 	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_SESS_NOT_FOUND,			/* Session name not found */
 	LTTCOMM_NO_TRACE,				/* No trace exist */
 	LTTCOMM_FATAL,					/* Session daemon had a fatal error */
 	LTTCOMM_NO_TRACEABLE,			/* Error for non traceable app */
@@ -98,6 +87,10 @@ enum lttcomm_return_code {
 	LTTCOMM_KERN_NA,				/* Kernel tracer unavalable */
 	LTTCOMM_KERN_SESS_FAIL,			/* Kernel create session failed */
 	LTTCOMM_KERN_CHAN_FAIL,			/* Kernel create channel failed */
+	LTTCOMM_KERN_CHAN_NOT_FOUND,	/* Kernel channel not found */
+	LTTCOMM_KERN_CHAN_DISABLE_FAIL, /* Kernel disable channel failed */
+	LTTCOMM_KERN_CHAN_ENABLE_FAIL,  /* Kernel enable channel failed */
+	LTTCOMM_KERN_CONTEXT_FAIL,      /* Kernel add context failed */
 	LTTCOMM_KERN_ENABLE_FAIL,		/* Kernel enable event failed */
 	LTTCOMM_KERN_DISABLE_FAIL,		/* Kernel disable event failed */
 	LTTCOMM_KERN_META_FAIL,			/* Kernel open metadata failed */
@@ -108,6 +101,7 @@ enum lttcomm_return_code {
 	LTTCOMM_KERN_DIR_FAIL,			/* Kernel trace directory creation failed */
 	LTTCOMM_KERN_DIR_EXIST,			/* Kernel trace directory exist */
 	LTTCOMM_KERN_NO_SESSION,		/* No kernel session found */
+	LTTCOMM_KERN_LIST_FAIL,			/* Kernel listing events 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 */
@@ -130,18 +124,29 @@ enum lttcomm_return_code {
  */
 struct lttcomm_session_msg {
 	u32 cmd_type;    /* enum lttcomm_sessiond_command */
-	uuid_t session_uuid;
-	char trace_name[NAME_MAX];
 	char session_name[NAME_MAX];
-	u32 pid;    /* pid_t */
+	char path[PATH_MAX];
+	pid_t pid;
 	union {
 		struct {
-			int auto_session;
-		} create_session;
-		/* Marker data */
+			char channel_name[NAME_MAX];
+			char name[NAME_MAX];
+		} disable;
+		/* Event data */
 		struct {
+			char channel_name[NAME_MAX];
+			struct lttng_event event;
+		} enable;
+		/* Create channel */
+		struct {
+			struct lttng_channel chan;
+		} channel;
+		/* Context */
+		struct {
+			char channel_name[NAME_MAX];
 			char event_name[NAME_MAX];
-		} event;
+			struct lttng_kernel_context ctx;
+		} context;
 	} u;
 };
 
@@ -152,9 +157,7 @@ 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[];
 };
@@ -167,8 +170,7 @@ struct lttcomm_lttng_msg {
  */
 struct lttcomm_kconsumerd_header {
 	u32 payload_size;
-	u32 cmd_type;	/* enum lttcomm_consumerd_command */
-	u32 ret_code;	/* enum lttcomm_return_code */
+	u32 cmd_type;	/* enum kconsumerd_command */
 };
 
 /* lttcomm_kconsumerd_msg represents a file descriptor to consume the