Import kernel control interface

[lttng-tools.git] / liblttsessiondcomm / liblttsessiondcomm.h

diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h
index a1960a94018f95178765ed922118a46c0431756c..4e86cc5475b6a11804079ac3344a453e61a8a6d6 100644 (file)
--- 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,
@@ -94,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 */
@@ -115,7 +130,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 +140,31 @@ struct lttcomm_session_msg {
                } create_session;
                /* Marker data */
                struct {
-                       char channel[NAME_MAX];
-                       char marker[NAME_MAX];
-               } marker;
-               /* SET_SOCK_PATH */
+                       char event_name[NAME_MAX];
+               } event;
+               /* Create channel kernel */
                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;
+                       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.
  */
-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 +186,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);