Fix: send per-pid session id in channel creation

[lttng-tools.git] / src / bin / lttng-sessiond / consumer.c

diff --git a/src/bin/lttng-sessiond/consumer.c b/src/bin/lttng-sessiond/consumer.c
index d91c3e60bf0e16156232ca3a2f251d0d6ae779e6..36883766955e07847503236d7f62334364033c33 100644 (file)
--- a/src/bin/lttng-sessiond/consumer.c
+++ b/src/bin/lttng-sessiond/consumer.c
@@ -28,6 +28,7 @@
 #include <common/common.h>
 #include <common/defaults.h>
 #include <common/uri.h>
+#include <common/utils.h>
 
 #include "consumer.h"
 #include "health.h"
@@ -721,7 +722,9 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                unsigned char *uuid,
                uint32_t chan_id,
                uint64_t tracefile_size,
-               uint64_t tracefile_count)
+               uint64_t tracefile_count,
+               uint64_t session_id_per_pid,
+               unsigned int monitor)
 {
        assert(msg);
 
@@ -737,6 +740,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
        msg->u.ask_channel.output = output;
        msg->u.ask_channel.type = type;
        msg->u.ask_channel.session_id = session_id;
+       msg->u.ask_channel.session_id_per_pid = session_id_per_pid;
        msg->u.ask_channel.uid = uid;
        msg->u.ask_channel.gid = gid;
        msg->u.ask_channel.relayd_id = relayd_id;
@@ -744,6 +748,7 @@ void consumer_init_ask_channel_comm_msg(struct lttcomm_consumer_msg *msg,
        msg->u.ask_channel.chan_id = chan_id;
        msg->u.ask_channel.tracefile_size = tracefile_size;
        msg->u.ask_channel.tracefile_count = tracefile_count;
+       msg->u.ask_channel.monitor = monitor;
 
        memcpy(msg->u.ask_channel.uuid, uuid, sizeof(msg->u.ask_channel.uuid));
 
@@ -771,7 +776,8 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
                enum lttng_event_output output,
                int type,
                uint64_t tracefile_size,
-               uint64_t tracefile_count)
+               uint64_t tracefile_count,
+               unsigned int monitor)
 {
        assert(msg);
 
@@ -790,6 +796,7 @@ void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
        msg->u.channel.type = type;
        msg->u.channel.tracefile_size = tracefile_size;
        msg->u.channel.tracefile_count = tracefile_count;
+       msg->u.channel.monitor = monitor;
 
        strncpy(msg->u.channel.pathname, pathname,
                        sizeof(msg->u.channel.pathname));
@@ -1188,9 +1195,10 @@ end:
  */
 int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                struct snapshot_output *output, int metadata, uid_t uid, gid_t gid,
-               int wait)
+               const char *session_path, int wait)
 {
        int ret;
+       char datetime[16];
        struct lttcomm_consumer_msg msg;
 
        assert(socket);
@@ -1200,8 +1208,14 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
 
        DBG("Consumer snapshot channel key %" PRIu64, key);
 
-       memset(&msg, 0, sizeof(msg));
+       ret = utils_get_current_time_str("%Y%m%d-%H%M%S", datetime,
+                       sizeof(datetime));
+       if (!ret) {
+               ret = -EINVAL;
+               goto error;
+       }
 
+       memset(&msg, 0, sizeof(msg));
        msg.cmd_type = LTTNG_CONSUMER_SNAPSHOT_CHANNEL;
        msg.u.snapshot_channel.key = key;
        msg.u.snapshot_channel.max_size = output->max_size;
@@ -1211,20 +1225,23 @@ int consumer_snapshot_channel(struct consumer_socket *socket, uint64_t key,
                msg.u.snapshot_channel.relayd_id = output->consumer->net_seq_index;
                msg.u.snapshot_channel.use_relayd = 1;
                ret = snprintf(msg.u.snapshot_channel.pathname,
-                               sizeof(msg.u.snapshot_channel.pathname), "%s/%s",
-                               output->consumer->subdir, DEFAULT_SNAPSHOT_NAME);
+                               sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
+                               output->consumer->subdir, output->name, datetime,
+                               session_path);
                if (ret < 0) {
                        ret = -LTTNG_ERR_NOMEM;
                        goto error;
                }
        } else {
                ret = snprintf(msg.u.snapshot_channel.pathname,
-                               sizeof(msg.u.snapshot_channel.pathname), "%s/%s",
-                               output->consumer->dst.trace_path, DEFAULT_SNAPSHOT_NAME);
+                               sizeof(msg.u.snapshot_channel.pathname), "%s/%s-%s%s",
+                               output->consumer->dst.trace_path, output->name, datetime,
+                               session_path);
                if (ret < 0) {
                        ret = -LTTNG_ERR_NOMEM;
                        goto error;
                }
+               msg.u.snapshot_channel.relayd_id = (uint64_t) -1ULL;
 
                /* Create directory. Ignore if exist. */
                ret = run_as_mkdir_recursive(msg.u.snapshot_channel.pathname,