X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-consumer.c;h=c2ac56679aec771a44043af177096b7f521889b1;hp=9ab54e9d7a64553f9e0d61d31d2e54661ad67ef9;hb=2d97a0067600335f07eecb2c1d9ba68fc164583e;hpb=3b9677124ab48bddc945ca67947c49b87b5853e0 diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c index 9ab54e9d7..c2ac56679 100644 --- a/src/bin/lttng-sessiond/ust-consumer.c +++ b/src/bin/lttng-sessiond/ust-consumer.c @@ -30,6 +30,7 @@ #include "consumer.h" #include "health-sessiond.h" #include "ust-consumer.h" +#include "lttng-ust-error.h" #include "buffer-registry.h" #include "session.h" #include "lttng-sessiond.h" @@ -55,6 +56,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, char shm_path[PATH_MAX] = ""; char root_shm_path[PATH_MAX] = ""; bool is_local_trace; + size_t consumer_path_offset = 0; assert(ua_sess); assert(ua_chan); @@ -66,7 +68,8 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, is_local_trace = consumer->net_seq_index == -1ULL; /* Format the channel's path (relative to the current trace chunk). */ - pathname = setup_channel_trace_path(consumer, ua_sess->path); + pathname = setup_channel_trace_path(consumer, ua_sess->path, + &consumer_path_offset); if (!pathname) { ret = -1; goto error; @@ -147,7 +150,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess, output, (int) ua_chan->attr.type, ua_sess->tracing_id, - pathname, + &pathname[consumer_path_offset], ua_chan->name, consumer->net_seq_index, ua_chan->key,