Extend the rotation API to provide network trace archive locations

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

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 89bf4596b54969ebd556d2d27faec3a66e011a98..74c4b302320de5b49926f1ff497c31b59f4fb9fa 100644 (file)
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -45,11 +45,20 @@ static char *create_channel_path(struct consumer_output *consumer,
        /* Get the right path name destination */
        if (consumer->type == CONSUMER_DST_LOCAL) {
                /* Set application path to the destination path */
-               ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
-                               consumer->dst.trace_path, consumer->subdir);
+               ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s%s",
+                               consumer->dst.session_root_path,
+                               consumer->chunk_path,
+                               consumer->subdir);
                if (ret < 0) {
                        PERROR("snprintf kernel channel path");
                        goto error;
+               } else if (ret >= sizeof(tmp_path)) {
+                       ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s%s\"",
+                                       sizeof(tmp_path), ret,
+                                       consumer->dst.session_root_path,
+                                       consumer->chunk_path,
+                                       consumer->subdir);
+                       goto error;
                }
                pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
                if (!pathname) {
@@ -67,10 +76,18 @@ static char *create_channel_path(struct consumer_output *consumer,
                }
                DBG3("Kernel local consumer tracefile path: %s", pathname);
        } else {
-               ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
+               ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
+                               consumer->dst.net.base_dir,
+                               consumer->subdir);
                if (ret < 0) {
                        PERROR("snprintf kernel metadata path");
                        goto error;
+               } else if (ret >= sizeof(tmp_path)) {
+                       ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s\"",
+                                       sizeof(tmp_path), ret,
+                                       consumer->dst.net.base_dir,
+                                       consumer->subdir);
+                       goto error;
                }
                pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
                if (!pathname) {
@@ -214,7 +231,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
        /* Prep channel message structure */
        consumer_init_channel_comm_msg(&lkm,
                        LTTNG_CONSUMER_ADD_CHANNEL,
-                       session->metadata->fd,
+                       session->metadata->key,
                        session->id,
                        pathname,
                        session->uid,
@@ -239,7 +256,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
        /* Prep stream message structure */
        consumer_init_stream_comm_msg(&lkm,
                        LTTNG_CONSUMER_ADD_STREAM,
-                       session->metadata->fd,
+                       session->metadata->key,
                        session->metadata_stream_fd,
                        0); /* CPU: 0 for metadata. */
 
@@ -493,11 +510,11 @@ int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
        assert(metadata);
        assert(socket);
 
-       DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+       DBG("Sending kernel consumer destroy channel key %" PRIu64, metadata->key);
 
        memset(&msg, 0, sizeof(msg));
        msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
-       msg.u.destroy_channel.key = metadata->fd;
+       msg.u.destroy_channel.key = metadata->key;
 
        pthread_mutex_lock(socket->lock);
        health_code_update();