X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.h;h=1950408222043d266f6fd69b83d3b9131bcf3024;hb=33a2b85433875769e92ca44a680c46b9498f5174;hp=9a31aacce04e7e72a8e2445c8c3e91eb01936ac9;hpb=aaf267147df386f0438de88782296077ff5b5861;p=lttng-tools.git

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index 9a31aacce..195040822 100644
--- a/liblttsessiondcomm/liblttsessiondcomm.h
+++ b/liblttsessiondcomm/liblttsessiondcomm.h
@@ -26,19 +26,12 @@
 
 #include "lttng-share.h"
 
-#define LTTNG_RUNDIR						"/var/run/lttng"
-
 /* Default unix socket path */
 #define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK		LTTNG_RUNDIR "/client-ltt-sessiond"
 #define DEFAULT_GLOBAL_APPS_UNIX_SOCK		LTTNG_RUNDIR "/apps-ltt-sessiond"
 #define DEFAULT_HOME_APPS_UNIX_SOCK			"%s/.apps-ltt-sessiond"
 #define DEFAULT_HOME_CLIENT_UNIX_SOCK		"%s/.client-ltt-sessiond"
 
-/* Kernel consumer path */
-#define KCONSUMERD_PATH						LTTNG_RUNDIR "/kconsumerd"
-#define KCONSUMERD_CMD_SOCK_PATH			KCONSUMERD_PATH "/command"
-#define KCONSUMERD_ERR_SOCK_PATH			KCONSUMERD_PATH "/error"
-
 /* Queue size of listen(2) */
 #define MAX_LISTEN 10
 
@@ -50,8 +43,11 @@
 enum lttcomm_sessiond_command {
 	KERNEL_CREATE_CHANNEL,
 	KERNEL_CREATE_SESSION,
+	KERNEL_CREATE_STREAM,
 	KERNEL_DISABLE_EVENT,
 	KERNEL_ENABLE_EVENT,
+	KERNEL_ENABLE_ALL_EVENT,
+	KERNEL_LIST_EVENTS,
 	KERNEL_OPEN_METADATA,
 	KERNEL_START_TRACE,
 	KERNEL_STOP_TRACE,
@@ -107,6 +103,14 @@ enum lttcomm_return_code {
 	LTTCOMM_KERN_ENABLE_FAIL,		/* Kernel enable event failed */
 	LTTCOMM_KERN_DISABLE_FAIL,		/* Kernel disable event failed */
 	LTTCOMM_KERN_META_FAIL,			/* Kernel open metadata failed */
+	LTTCOMM_KERN_START_FAIL,		/* Kernel start trace failed */
+	LTTCOMM_KERN_STOP_FAIL,			/* Kernel stop trace failed */
+	LTTCOMM_KERN_CONSUMER_FAIL,		/* Kernel consumer start failed */
+	LTTCOMM_KERN_STREAM_FAIL,		/* Kernel create stream failed */
+	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 */
@@ -124,20 +128,6 @@ enum lttcomm_return_code {
 	LTTCOMM_NR,						/* Last element */
 };
 
-/* commands for kconsumerd */
-enum lttcomm_consumerd_command {
-	LTTCOMM_ADD_STREAM = 1100,
-	LTTCOMM_UPDATE_STREAM, /* pause, delete, start depending on fd state */
-	LTTCOMM_STOP, /* delete all */
-};
-
-/* state of each fd in consumerd */
-enum lttcomm_kconsumerd_fd_state {
-	ACTIVE_FD,
-	PAUSE_FD,
-	DELETE_FD,
-};
-
 /*
  * Data structure received from lttng client to session daemon.
  */
@@ -180,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
@@ -199,6 +188,7 @@ extern int lttcomm_connect_unix_sock(const char *pathname);
 extern int lttcomm_accept_unix_sock(int sock);
 extern int lttcomm_listen_unix_sock(int sock);
 extern int lttcomm_close_unix_sock(int sock);
+extern ssize_t lttcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd, size_t len);
 extern ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len);
 extern ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len);
 extern const char *lttcomm_get_readable_code(enum lttcomm_return_code code);