X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.h;h=5d2fa36a8b02fa9b7417b92c87a49b5a742c384f;hb=ca22feea083301934d1c8511851c86fb008c0697;hp=6d796efe42e650b20683c58e74be725db4716ba0;hpb=c30aaa51f34105a7f20b9ceb39866001843db6e6;p=lttng-tools.git diff --git a/src/common/sessiond-comm/sessiond-comm.h b/src/common/sessiond-comm/sessiond-comm.h index 6d796efe4..5d2fa36a8 100644 --- a/src/common/sessiond-comm/sessiond-comm.h +++ b/src/common/sessiond-comm/sessiond-comm.h @@ -167,12 +167,12 @@ 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; } enable; /* Create channel */ @@ -181,8 +181,8 @@ struct lttcomm_session_msg { } channel; /* Context */ struct { - char channel_name[NAME_MAX]; - char event_name[NAME_MAX]; + char channel_name[LTTNG_SYMBOL_NAME_LEN]; + char event_name[LTTNG_SYMBOL_NAME_LEN]; struct lttng_event_context ctx; } context; /* Use by register_consumer */ @@ -191,7 +191,7 @@ 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_url and used by create_session also call */ @@ -200,8 +200,8 @@ struct lttcomm_session_msg { uint32_t size; } uri; struct { - char channel_name[NAME_MAX]; - char event_name[NAME_MAX]; + char channel_name[LTTNG_SYMBOL_NAME_LEN]; + char event_name[LTTNG_SYMBOL_NAME_LEN]; /* Length of following bytecode */ uint32_t bytecode_len; } filter; @@ -272,6 +272,7 @@ struct lttcomm_consumer_msg { int net_index; unsigned int metadata_flag; char name[LTTNG_SYMBOL_NAME_LEN]; /* Name string of the stream */ + uint64_t session_id; /* Tracing session id of the stream */ } stream; struct { int net_index; @@ -282,6 +283,9 @@ struct lttcomm_consumer_msg { struct { uint64_t net_seq_idx; } destroy_relayd; + struct { + uint64_t session_id; + } data_available; } u; };