X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;fp=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=575593f03d85139ada759695c92622e217b1f721;hp=01d71ce01e34f9a58f13feca4ec6f520e9664bf7;hb=e098433c90550d74288498f8c4474ef4c2daea68;hpb=3e25d926e1c03011c68430e3a358d1e9a10ca9ab diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c index 01d71ce01..575593f03 100644 --- a/src/bin/lttng-sessiond/ust-consumer.c +++ b/src/bin/lttng-sessiond/ust-consumer.c @@ -108,8 +108,11 @@ error: * Consumer socket lock MUST be acquired before calling this. */ static int ask_channel_creation(struct ust_app_session *ua_sess, - struct ust_app_channel *ua_chan, struct consumer_output *consumer, - struct consumer_socket *socket, struct ust_registry_session *registry) + struct ust_app_channel *ua_chan, + struct consumer_output *consumer, + struct consumer_socket *socket, + struct ust_registry_session *registry, + uint64_t trace_archive_id) { int ret, output; uint32_t chan_id; @@ -201,7 +204,8 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, ua_sess->output_traces, ua_sess->uid, ua_chan->attr.blocking_timeout, - root_shm_path, shm_path); + root_shm_path, shm_path, + trace_archive_id); health_code_update(); @@ -239,8 +243,11 @@ error: * Returns 0 on success else a negative value. */ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, - struct ust_app_channel *ua_chan, struct consumer_output *consumer, - struct consumer_socket *socket, struct ust_registry_session *registry) + struct ust_app_channel *ua_chan, + struct consumer_output *consumer, + struct consumer_socket *socket, + struct ust_registry_session *registry, + uint64_t trace_archive_id) { int ret; @@ -257,7 +264,8 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess, } pthread_mutex_lock(socket->lock); - ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry); + ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry, + trace_archive_id); pthread_mutex_unlock(socket->lock); if (ret < 0) { ERR("ask_channel_creation consumer command failed");