X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=41f96d8a4288c355d60df2655bbd04b135102f79;hb=178191b3899f114001f000c2e7f46909969f9c6f;hp=f60c5d238a364037fa21a75b42ac128910ce3d61;hpb=806e2684ce24d3772af37ee46c5f0500c7a0723f;p=lttng-tools.git diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h index f60c5d238..41f96d8a4 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.h @@ -30,6 +30,7 @@ #include #include #include +#include #include #include @@ -85,9 +86,11 @@ enum lttcomm_sessiond_command { RELAYD_VERSION, RELAYD_SEND_METADATA, RELAYD_CLOSE_STREAM, + RELAYD_DATA_PENDING, + RELAYD_QUIESCENT_CONTROL, LTTNG_SET_FILTER, LTTNG_HEALTH_CHECK, - LTTNG_DATA_AVAILABLE, + LTTNG_DATA_PENDING, }; /* @@ -183,7 +186,6 @@ struct lttcomm_session_msg { /* Context */ struct { char channel_name[LTTNG_SYMBOL_NAME_LEN]; - char event_name[LTTNG_SYMBOL_NAME_LEN]; struct lttng_event_context ctx; } context; /* Use by register_consumer */ @@ -202,7 +204,7 @@ struct lttcomm_session_msg { } uri; struct { char channel_name[LTTNG_SYMBOL_NAME_LEN]; - char event_name[LTTNG_SYMBOL_NAME_LEN]; + struct lttng_event event; /* Length of following bytecode */ uint32_t bytecode_len; } filter; @@ -219,6 +221,7 @@ struct lttcomm_session_msg { struct lttng_filter_bytecode { uint32_t len; /* len of data */ uint32_t reloc_table_offset; + uint64_t seqnum; char data[0]; }; @@ -272,7 +275,7 @@ 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 { @@ -286,7 +289,7 @@ struct lttcomm_consumer_msg { } destroy_relayd; struct { uint64_t session_id; - } data_available; + } data_pending; } u; };