X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=bbc7ce5a8e403156e1bedc38ba574ffdccc390ea;hp=2450e79ec5bd78379941e9765de694a02df76ed8;hb=00c76ceaeb0074e47167be56c0920284e6a0360e;hpb=554831e798d0646f5d8c261b6207527c5f839222 diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h index 2450e79ec..bbc7ce5a8 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.h @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -80,14 +81,16 @@ enum lttcomm_sessiond_command { LTTNG_DISABLE_CONSUMER = 19, LTTNG_ENABLE_CONSUMER = 20, LTTNG_SET_CONSUMER_URI = 21, - LTTNG_ENABLE_EVENT_WITH_FILTER = 22, - LTTNG_HEALTH_CHECK = 23, + /* 22 */ + /* 23 */ LTTNG_DATA_PENDING = 24, LTTNG_SNAPSHOT_ADD_OUTPUT = 25, LTTNG_SNAPSHOT_DEL_OUTPUT = 26, LTTNG_SNAPSHOT_LIST_OUTPUT = 27, LTTNG_SNAPSHOT_RECORD = 28, LTTNG_CREATE_SESSION_SNAPSHOT = 29, + LTTNG_CREATE_SESSION_LIVE = 30, + LTTNG_SAVE_SESSION = 31, }; enum lttcomm_relayd_command { @@ -102,12 +105,20 @@ enum lttcomm_relayd_command { RELAYD_QUIESCENT_CONTROL = 9, RELAYD_BEGIN_DATA_PENDING = 10, RELAYD_END_DATA_PENDING = 11, + RELAYD_ADD_INDEX = 12, + RELAYD_SEND_INDEX = 13, + RELAYD_CLOSE_INDEX = 14, + /* Live-reading commands (2.4+). */ + RELAYD_LIST_SESSIONS = 15, + /* All streams of the channel have been sent to the relayd (2.4+). */ + RELAYD_STREAMS_SENT = 16, }; /* * lttcomm error code. */ enum lttcomm_return_code { + LTTCOMM_CONSUMERD_SUCCESS = 0, /* Everything went fine. */ 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 */ @@ -126,6 +137,7 @@ enum lttcomm_return_code { LTTCOMM_CONSUMERD_ERROR_METADATA, /* Error with metadata. */ LTTCOMM_CONSUMERD_FATAL, /* Fatal error. */ LTTCOMM_CONSUMERD_RELAYD_FAIL, /* Error on remote relayd */ + LTTCOMM_CONSUMERD_CHANNEL_FAIL, /* Channel creation failed. */ /* MUST be last element */ LTTCOMM_NR, /* Last element */ @@ -222,8 +234,19 @@ struct lttcomm_session_msg { struct { char channel_name[LTTNG_SYMBOL_NAME_LEN]; struct lttng_event event; + /* Length of following filter expression. */ + uint32_t expression_len; /* Length of following bytecode for filter. */ uint32_t bytecode_len; + /* exclusion data */ + uint32_t exclusion_count; + /* + * After this structure, the following variable-length + * items are transmitted: + * - char exclusion_names[LTTNG_SYMBOL_NAME_LEN][exclusion_count] + * - unsigned char filter_expression[expression_len] + * - unsigned char filter_bytecode[bytecode_len] + */ } LTTNG_PACKED enable; /* Create channel */ struct { @@ -255,6 +278,13 @@ struct lttcomm_session_msg { uint32_t wait; struct lttng_snapshot_output output; } LTTNG_PACKED snapshot_record; + struct { + uint32_t nb_uri; + unsigned int timer_interval; /* usec */ + } LTTNG_PACKED session_live; + struct { + struct lttng_save_session_attr attr; + } LTTNG_PACKED save_session; } u; } LTTNG_PACKED; @@ -274,6 +304,18 @@ struct lttng_filter_bytecode { char data[0]; } LTTNG_PACKED; +/* + * Event exclusion data. At the end of the structure, there will actually + * by zero or more names, where the actual number of names is given by + * the 'count' item of the structure. + */ +#define LTTNG_EVENT_EXCLUSION_PADDING 32 +struct lttng_event_exclusion { + uint32_t count; + char padding[LTTNG_EVENT_EXCLUSION_PADDING]; + char names[LTTNG_SYMBOL_NAME_LEN][0]; +} LTTNG_PACKED; + /* * Data structure for the response from sessiond to the lttng client. */ @@ -290,15 +332,6 @@ struct lttcomm_lttng_output_id { uint32_t id; } LTTNG_PACKED; -struct lttcomm_health_msg { - uint32_t component; - uint32_t cmd; -} LTTNG_PACKED; - -struct lttcomm_health_data { - uint32_t ret_code; -} LTTNG_PACKED; - /* * lttcomm_consumer_msg is the message sent from sessiond to consumerd * to either add a channel, add a stream, update a stream, or stop @@ -324,6 +357,8 @@ struct lttcomm_consumer_msg { uint32_t tracefile_count; /* number of tracefiles */ /* If the channel's streams have to be monitored or not. */ uint32_t monitor; + /* timer to check the streams usage in live mode (usec). */ + unsigned int live_timer_interval; } LTTNG_PACKED channel; /* Only used by Kernel. */ struct { uint64_t stream_key; @@ -339,6 +374,8 @@ struct lttcomm_consumer_msg { struct lttcomm_relayd_sock sock; /* Tracing session id associated to the relayd. */ uint64_t session_id; + /* Relayd session id, only used with control socket. */ + uint64_t relayd_session_id; } LTTNG_PACKED relayd_sock; struct { uint64_t net_seq_idx; @@ -352,6 +389,7 @@ struct lttcomm_consumer_msg { int32_t overwrite; /* 1: overwrite, 0: discard */ uint32_t switch_timer_interval; /* usec */ uint32_t read_timer_interval; /* usec */ + unsigned int live_timer_interval; /* usec */ int32_t output; /* splice, mmap */ int32_t type; /* metadata or per_cpu */ uint64_t session_id; /* Tracing session id */ @@ -368,6 +406,13 @@ struct lttcomm_consumer_msg { uint64_t session_id_per_pid; /* Per-pid session ID. */ /* Tells the consumer if the stream should be or not monitored. */ uint32_t monitor; + /* + * For UST per UID buffers, this is the application UID of the + * channel. This can be different from the user UID requesting the + * channel creation and used for the rights on the stream file + * because the application can be in the tracing for instance. + */ + uint32_t ust_app_uid; } LTTNG_PACKED ask_channel; struct { uint64_t key; @@ -398,6 +443,10 @@ struct lttcomm_consumer_msg { uint64_t key; uint64_t max_stream_size; } LTTNG_PACKED snapshot_channel; + struct { + uint64_t channel_key; + uint64_t net_seq_idx; + } LTTNG_PACKED sent_streams; } u; } LTTNG_PACKED; @@ -405,11 +454,11 @@ struct lttcomm_consumer_msg { * Status message returned to the sessiond after a received command. */ struct lttcomm_consumer_status_msg { - enum lttng_error_code ret_code; + enum lttcomm_return_code ret_code; } LTTNG_PACKED; struct lttcomm_consumer_status_channel { - enum lttng_error_code ret_code; + enum lttcomm_return_code ret_code; uint64_t key; unsigned int stream_count; } LTTNG_PACKED; @@ -474,6 +523,9 @@ extern void lttcomm_copy_sock(struct lttcomm_sock *dst, extern struct lttcomm_relayd_sock *lttcomm_alloc_relayd_sock( struct lttng_uri *uri, uint32_t major, uint32_t minor); +extern int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int msec); +extern int lttcomm_setsockopt_snd_timeout(int sock, unsigned int msec); + extern void lttcomm_init(void); /* Get network timeout, in milliseconds */ extern unsigned long lttcomm_get_network_timeout(void);