X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.h;h=d63f9b62cc89334edc01036ec4e310df89dcfe27;hp=5cac0b7982ecef86c52dde2ca69b9ef280ee9e55;hb=33cb613d0d0e9238591566ce7b86868f9976c597;hpb=6abb15de23fcd1413963aef20f9f2c243f1bf749 diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h index 5cac0b798..d63f9b62c 100644 --- a/liblttsessiondcomm/liblttsessiondcomm.h +++ b/liblttsessiondcomm/liblttsessiondcomm.h @@ -24,7 +24,7 @@ #include #include -#define LTTNG_RUNDIR "/var/run/lttng" +#include "lttng-share.h" /* Default unix socket path */ #define DEFAULT_GLOBAL_CLIENT_UNIX_SOCK LTTNG_RUNDIR "/client-ltt-sessiond" @@ -32,11 +32,6 @@ #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 @@ -46,6 +41,14 @@ #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, LTTNG_CREATE_SESSION, LTTNG_DESTROY_SESSION, LTTNG_FORCE_SUBBUF_SWITCH, @@ -74,90 +77,86 @@ 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 */ -}; - -/* 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, + 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 */ + 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 */ + 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 */ + KCONSUMERD_SPLICE_EBADF, /* EBADF from splice(2) */ + KCONSUMERD_SPLICE_EINVAL, /* EINVAL from splice(2) */ + KCONSUMERD_SPLICE_ENOMEM, /* ENOMEM from splice(2) */ + KCONSUMERD_SPLICE_ESPIPE, /* ESPIPE from splice(2) */ + /* MUST be last element */ + LTTCOMM_NR, /* Last element */ }; /* - * 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 */ - 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 lttng client response. - * - * This data structure is the control struct use in - * the header of the transmission. NEVER put variable - * size data in here. + * Data structure for the response from sessiond to the lttng client. */ -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[]; }; /* @@ -167,9 +166,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 @@ -178,7 +177,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); @@ -186,6 +186,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);