X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=011a1290a99097c6cb36c52c84209e57e25ac265;hp=aebe30c6abb1496504e56ab90bf50213cfa388ec;hb=3c82c39ffc82422b1c506f22d9a20cac29cb7d87;hpb=173af62f4804133d4a7f45e34b6f72126f3eca5f diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h index aebe30c6a..011a1290a 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.h @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include #include @@ -47,152 +49,68 @@ /* * Get the error code index from 0 since LTTCOMM_OK start at 1000 */ -#define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_OK) +#define LTTCOMM_ERR_INDEX(code) (code - LTTCOMM_CONSUMERD_COMMAND_SOCK_READY) enum lttcomm_sessiond_command { /* Tracer command */ - LTTNG_ADD_CONTEXT, - LTTNG_CALIBRATE, - LTTNG_DISABLE_CHANNEL, - LTTNG_DISABLE_EVENT, - LTTNG_DISABLE_ALL_EVENT, - LTTNG_ENABLE_CHANNEL, - LTTNG_ENABLE_EVENT, - LTTNG_ENABLE_ALL_EVENT, + LTTNG_ADD_CONTEXT = 1, + LTTNG_CALIBRATE = 2, + LTTNG_DISABLE_CHANNEL = 3, + LTTNG_DISABLE_EVENT = 4, + LTTNG_DISABLE_ALL_EVENT = 5, + LTTNG_ENABLE_CHANNEL = 6, + LTTNG_ENABLE_EVENT = 7, + LTTNG_ENABLE_ALL_EVENT = 8, /* Session daemon command */ - LTTNG_CREATE_SESSION, - LTTNG_CREATE_SESSION_URI, - LTTNG_DESTROY_SESSION, - LTTNG_LIST_CHANNELS, - LTTNG_LIST_DOMAINS, - LTTNG_LIST_EVENTS, - LTTNG_LIST_SESSIONS, - LTTNG_LIST_TRACEPOINTS, - LTTNG_REGISTER_CONSUMER, - LTTNG_START_TRACE, - LTTNG_STOP_TRACE, - LTTNG_LIST_TRACEPOINT_FIELDS, + LTTNG_CREATE_SESSION = 9, + LTTNG_DESTROY_SESSION = 10, + LTTNG_LIST_CHANNELS = 11, + LTTNG_LIST_DOMAINS = 12, + LTTNG_LIST_EVENTS = 13, + LTTNG_LIST_SESSIONS = 14, + LTTNG_LIST_TRACEPOINTS = 15, + LTTNG_REGISTER_CONSUMER = 16, + LTTNG_START_TRACE = 17, + LTTNG_STOP_TRACE = 18, + LTTNG_LIST_TRACEPOINT_FIELDS = 19, /* Consumer */ - LTTNG_DISABLE_CONSUMER, - LTTNG_ENABLE_CONSUMER, - LTTNG_SET_CONSUMER_URI, + LTTNG_DISABLE_CONSUMER = 20, + LTTNG_ENABLE_CONSUMER = 21, + LTTNG_SET_CONSUMER_URI = 22, /* Relay daemon */ - RELAYD_ADD_STREAM, - RELAYD_CREATE_SESSION, - RELAYD_START_DATA, - RELAYD_UPDATE_SYNC_INFO, - RELAYD_VERSION, - RELAYD_SEND_METADATA, - RELAYD_CLOSE_STREAM, - LTTNG_SET_FILTER, - LTTNG_HEALTH_CHECK, + RELAYD_ADD_STREAM = 23, + RELAYD_CREATE_SESSION = 24, + RELAYD_START_DATA = 25, + RELAYD_UPDATE_SYNC_INFO = 26, + RELAYD_VERSION = 27, + RELAYD_SEND_METADATA = 28, + RELAYD_CLOSE_STREAM = 29, + RELAYD_DATA_PENDING = 30, + RELAYD_QUIESCENT_CONTROL = 31, + LTTNG_ENABLE_EVENT_WITH_FILTER = 32, + LTTNG_HEALTH_CHECK = 33, + LTTNG_DATA_PENDING = 34, }; /* * lttcomm error code. */ enum lttcomm_return_code { - LTTCOMM_OK = 10, /* Ok */ - LTTCOMM_ERR, /* Unknown Error */ - LTTCOMM_UND, /* Undefine command */ - LTTCOMM_NOT_IMPLEMENTED, /* Command not implemented */ - LTTCOMM_UNKNOWN_DOMAIN, /* Tracing domain not known */ - LTTCOMM_ALLOC_FAIL, /* Trace allocation fail */ - LTTCOMM_NO_SESSION, /* No session found */ - LTTCOMM_CREATE_DIR_FAIL, /* Create directory 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_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 */ - LTTCOMM_SELECT_SESS, /* Must select a session */ - LTTCOMM_EXIST_SESS, /* Session name already exist */ - LTTCOMM_NO_EVENT, /* No event found */ - LTTCOMM_CONNECT_FAIL, /* Unable to connect to unix socket */ - LTTCOMM_APP_NOT_FOUND, /* App not found in traceable app list */ - LTTCOMM_EPERM, /* Permission denied */ - LTTCOMM_KERN_NA, /* Kernel tracer unavalable */ - LTTCOMM_KERN_VERSION, /* Kernel tracer version is not compatible */ - LTTCOMM_KERN_EVENT_EXIST, /* Kernel event already exists */ - LTTCOMM_KERN_SESS_FAIL, /* Kernel create session failed */ - LTTCOMM_KERN_CHAN_EXIST, /* Kernel channel already exists */ - 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 */ - 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 */ - LTTCOMM_UST_CALIBRATE_FAIL, /* UST calibration failed */ - LTTCOMM_UST_VERSION, /* UST tracer version is not compatible */ - LTTCOMM_UST_SESS_FAIL, /* UST create session failed */ - LTTCOMM_UST_CHAN_EXIST, /* UST channel already exist */ - LTTCOMM_UST_CHAN_FAIL, /* UST create channel failed */ - LTTCOMM_UST_CHAN_NOT_FOUND, /* UST channel not found */ - LTTCOMM_UST_CHAN_DISABLE_FAIL, /* UST disable channel failed */ - LTTCOMM_UST_CHAN_ENABLE_FAIL, /* UST enable channel failed */ - LTTCOMM_UST_CONTEXT_FAIL, /* UST add context failed */ - LTTCOMM_UST_ENABLE_FAIL, /* UST enable event failed */ - LTTCOMM_UST_DISABLE_FAIL, /* UST disable event failed */ - LTTCOMM_UST_META_FAIL, /* UST open metadata failed */ - LTTCOMM_UST_START_FAIL, /* UST start trace failed */ - LTTCOMM_UST_STOP_FAIL, /* UST stop trace failed */ - LTTCOMM_UST_CONSUMER64_FAIL, /* 64-bit UST consumer start failed */ - LTTCOMM_UST_CONSUMER32_FAIL, /* 32-bit UST consumer start failed */ - LTTCOMM_UST_STREAM_FAIL, /* UST create stream failed */ - LTTCOMM_UST_DIR_FAIL, /* UST trace directory creation failed */ - LTTCOMM_UST_DIR_EXIST, /* UST trace directory exist */ - LTTCOMM_UST_NO_SESSION, /* No UST session found */ - LTTCOMM_UST_LIST_FAIL, /* UST listing events failed */ - LTTCOMM_UST_EVENT_EXIST, /* UST event exist */ - LTTCOMM_UST_EVENT_NOT_FOUND, /* UST event not found */ - LTTCOMM_UST_CONTEXT_EXIST, /* UST context exist */ - LTTCOMM_UST_CONTEXT_INVAL, /* UST context invalid */ - LTTCOMM_NEED_ROOT_SESSIOND, /* root sessiond is needed */ - LTTCOMM_TRACE_ALREADY_STARTED, /* Tracing already started */ - LTTCOMM_TRACE_ALREADY_STOPPED, /* Tracing already stopped */ - LTTCOMM_KERN_EVENT_ENOSYS, /* Kernel event type not supported */ - - CONSUMERD_COMMAND_SOCK_READY, /* when consumerd command socket ready */ - CONSUMERD_SUCCESS_RECV_FD, /* success on receiving fds */ - CONSUMERD_ERROR_RECV_FD, /* error on receiving fds */ - CONSUMERD_ERROR_RECV_CMD, /* error on receiving command */ - CONSUMERD_POLL_ERROR, /* Error in polling thread in kconsumerd */ - CONSUMERD_POLL_NVAL, /* Poll on closed fd */ - CONSUMERD_POLL_HUP, /* All fds have hungup */ - CONSUMERD_EXIT_SUCCESS, /* kconsumerd exiting normally */ - CONSUMERD_EXIT_FAILURE, /* kconsumerd exiting on error */ - CONSUMERD_OUTFD_ERROR, /* error opening the tracefile */ - CONSUMERD_SPLICE_EBADF, /* EBADF from splice(2) */ - CONSUMERD_SPLICE_EINVAL, /* EINVAL from splice(2) */ - CONSUMERD_SPLICE_ENOMEM, /* ENOMEM from splice(2) */ - CONSUMERD_SPLICE_ESPIPE, /* ESPIPE from splice(2) */ - LTTCOMM_INVALID, /* Invalid parameter */ - LTTCOMM_NO_USTCONSUMERD, /* No UST consumer detected */ - LTTCOMM_NO_KERNCONSUMERD, /* No Kernel consumer detected */ - LTTCOMM_EVENT_EXIST_LOGLEVEL, /* Event already enabled with different loglevel */ - LTTCOMM_URI_DATA_MISS, /* Missing network data URI */ - LTTCOMM_URI_CTRL_MISS, /* Missing network control URI */ - LTTCOMM_ENABLE_CONSUMER_FAIL, /* Enabling consumer failed */ - LTTCOMM_RELAYD_SESSION_FAIL, /* lttng-relayd create session failed */ - LTTCOMM_RELAYD_VERSION_FAIL, /* lttng-relayd not compatible */ - LTTCOMM_FILTER_INVAL, /* Invalid filter bytecode */ - LTTCOMM_FILTER_NOMEM, /* Lack of memory for filter bytecode */ - LTTCOMM_FILTER_EXIST, /* Filter already exist */ + LTTCOMM_CONSUMERD_COMMAND_SOCK_READY = 1, /* Command socket ready */ + LTTCOMM_CONSUMERD_SUCCESS_RECV_FD, /* Success on receiving fds */ + LTTCOMM_CONSUMERD_ERROR_RECV_FD, /* Error on receiving fds */ + LTTCOMM_CONSUMERD_ERROR_RECV_CMD, /* Error on receiving command */ + LTTCOMM_CONSUMERD_POLL_ERROR, /* Error in polling thread */ + LTTCOMM_CONSUMERD_POLL_NVAL, /* Poll on closed fd */ + LTTCOMM_CONSUMERD_POLL_HUP, /* All fds have hungup */ + LTTCOMM_CONSUMERD_EXIT_SUCCESS, /* Consumerd exiting normally */ + LTTCOMM_CONSUMERD_EXIT_FAILURE, /* Consumerd exiting on error */ + LTTCOMM_CONSUMERD_OUTFD_ERROR, /* Error opening the tracefile */ + LTTCOMM_CONSUMERD_SPLICE_EBADF, /* EBADF from splice(2) */ + LTTCOMM_CONSUMERD_SPLICE_EINVAL, /* EINVAL from splice(2) */ + LTTCOMM_CONSUMERD_SPLICE_ENOMEM, /* ENOMEM from splice(2) */ + LTTCOMM_CONSUMERD_SPLICE_ESPIPE, /* ESPIPE from splice(2) */ /* MUST be last element */ LTTCOMM_NR, /* Last element */ @@ -208,8 +126,8 @@ enum lttcomm_sock_proto { * Index in the net_families array below. Please keep in sync! */ enum lttcomm_sock_domain { - LTTCOMM_INET = 1, - LTTCOMM_INET6 = 2, + LTTCOMM_INET = 0, + LTTCOMM_INET6 = 1, }; struct lttcomm_sockaddr { @@ -253,13 +171,15 @@ struct lttcomm_session_msg { struct lttng_domain domain; union { struct { - char channel_name[NAME_MAX]; + char channel_name[LTTNG_SYMBOL_NAME_LEN]; char name[NAME_MAX]; } disable; /* Event data */ struct { - char channel_name[NAME_MAX]; + char channel_name[LTTNG_SYMBOL_NAME_LEN]; struct lttng_event event; + /* Length of following bytecode for filter. */ + uint32_t bytecode_len; } enable; /* Create channel */ struct { @@ -267,8 +187,7 @@ struct lttcomm_session_msg { } channel; /* Context */ struct { - char channel_name[NAME_MAX]; - char event_name[NAME_MAX]; + char channel_name[LTTNG_SYMBOL_NAME_LEN]; struct lttng_event_context ctx; } context; /* Use by register_consumer */ @@ -277,35 +196,30 @@ struct lttcomm_session_msg { } reg; /* List */ struct { - char channel_name[NAME_MAX]; + char channel_name[LTTNG_SYMBOL_NAME_LEN]; } list; struct lttng_calibrate calibrate; - /* Used by the set_consumer_uri call */ - struct lttng_uri uri; - struct { - uint32_t enable_consumer; - struct lttng_uri ctrl_uri; - struct lttng_uri data_uri; - } create_uri; + /* Used by the set_consumer_url and used by create_session also call */ struct { - char channel_name[NAME_MAX]; - char event_name[NAME_MAX]; - /* Length of following bytecode */ - uint32_t bytecode_len; - } filter; + /* Number of lttng_uri following */ + uint32_t size; + } uri; } u; }; -#define LTTNG_FILTER_MAX_LEN 65336 +#define LTTNG_FILTER_MAX_LEN 65536 /* * Filter bytecode data. The reloc table is located at the end of the * bytecode. It is made of tuples: (uint16_t, var. len. string). It * starts at reloc_table_offset. */ +#define LTTNG_FILTER_PADDING 32 struct lttng_filter_bytecode { - uint16_t len; /* len of data */ - uint16_t reloc_table_offset; + uint32_t len; /* len of data */ + uint32_t reloc_table_offset; + uint64_t seqnum; + char padding[LTTNG_FILTER_PADDING]; char data[0]; }; @@ -343,6 +257,8 @@ struct lttcomm_consumer_msg { uint64_t max_sb_size; /* the subbuffer size for this channel */ /* shm_fd and wait_fd are sent as ancillary data */ uint64_t mmap_len; + /* nb_init_streams is the number of streams open initially. */ + unsigned int nb_init_streams; char name[LTTNG_SYMBOL_NAME_LEN]; } channel; struct { @@ -357,7 +273,8 @@ struct lttcomm_consumer_msg { char path_name[PATH_MAX]; int net_index; unsigned int metadata_flag; - char name[LTTNG_SYMBOL_NAME_LEN]; /* Name string of the stream */ + char name[DEFAULT_STREAM_NAME_LEN]; /* Name string of the stream */ + uint64_t session_id; /* Tracing session id of the stream */ } stream; struct { int net_index; @@ -368,6 +285,9 @@ struct lttcomm_consumer_msg { struct { uint64_t net_seq_idx; } destroy_relayd; + struct { + uint64_t session_id; + } data_pending; } u; };