X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=liblttsessiondcomm%2Fliblttsessiondcomm.h;h=580d4c2c75381fbe30220d7d2111be7d6c753057;hp=adb9a8d843572d96f62938d02daf0ea111599c89;hb=0632499a602c5588da22d191c14827be3b86a01a;hpb=5e16da05d15eb413f28dea441e1bc49809cddc9b diff --git a/liblttsessiondcomm/liblttsessiondcomm.h b/liblttsessiondcomm/liblttsessiondcomm.h index adb9a8d84..580d4c2c7 100644 --- a/liblttsessiondcomm/liblttsessiondcomm.h +++ b/liblttsessiondcomm/liblttsessiondcomm.h @@ -24,10 +24,7 @@ #include #include -/* - * 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, @@ -79,24 +82,42 @@ 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 */ + 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 */ + 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 */ }; /* commands for kconsumerd */ @@ -114,55 +135,37 @@ 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 */ - 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 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 +175,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 +186,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);