Create stream files relative to a stream's current trace chunk

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

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 6be57e447809cbf1a918490452c2ff893ee9a977..c39a87fba7895da17d663bee882c85c480e7f4d3 100644 (file)
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -36,13 +36,12 @@
 
 /*
  * Return allocated full pathname of the session using the consumer trace path
- * and subdir if available. On a successful allocation, the directory of the
- * trace is created with the session credentials.
+ * and subdir if available.
  *
  * The caller can safely free(3) the returned value. On error, NULL is
  * returned.
  */
-static char *setup_trace_path(struct consumer_output *consumer,
+static char *setup_channel_trace_path(struct consumer_output *consumer,
                struct ust_app_session *ua_sess)
 {
        int ret;
@@ -65,34 +64,24 @@ static char *setup_trace_path(struct consumer_output *consumer,
        /* Get correct path name destination */
        if (consumer->type == CONSUMER_DST_LOCAL) {
                /* Set application path to the destination path */
-               ret = snprintf(pathname, LTTNG_PATH_MAX, "%s/%s%s/%s",
-                               consumer->dst.session_root_path,
-                               consumer->chunk_path,
+               ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s",
                                consumer->domain_subdir, ua_sess->path);
-               if (ret < 0) {
-                       PERROR("snprintf channel path");
-                       goto error;
-               }
-
-               /* Create directory. Ignore if exist. */
-               ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG,
-                               ua_sess->euid, ua_sess->egid);
-               if (ret < 0) {
-                       if (errno != EEXIST) {
-                               ERR("Trace directory creation error");
-                               goto error;
-                       }
-               }
+               DBG3("Userspace local consumer trace path relative to current trace chunk: \"%s\"",
+                               pathname);
        } else {
                ret = snprintf(pathname, LTTNG_PATH_MAX, "%s%s/%s%s",
                                consumer->dst.net.base_dir,
                                consumer->chunk_path,
                                consumer->domain_subdir,
                                ua_sess->path);
-               if (ret < 0) {
-                       PERROR("snprintf channel path");
-                       goto error;
-               }
+       }
+       if (ret < 0) {
+               PERROR("Failed to format channel path");
+               goto error;
+       } else if (ret >= LTTNG_PATH_MAX) {
+               ERR("Truncation occurred while formatting channel path");
+               ret = -1;
+               goto error;
        }
 
        return pathname;
@@ -112,7 +101,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                struct consumer_output *consumer,
                struct consumer_socket *socket,
                struct ust_registry_session *registry,
-               uint64_t trace_archive_id)
+               struct lttng_trace_chunk *trace_chunk)
 {
        int ret, output;
        uint32_t chan_id;
@@ -122,6 +111,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
        struct ust_registry_channel *chan_reg;
        char shm_path[PATH_MAX] = "";
        char root_shm_path[PATH_MAX] = "";
+       bool is_local_trace;
 
        assert(ua_sess);
        assert(ua_chan);
@@ -131,10 +121,34 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
 
        DBG2("Asking UST consumer for channel");
 
-       /* Get and create full trace path of session. */
-       if (ua_sess->output_traces) {
-               pathname = setup_trace_path(consumer, ua_sess);
-               if (!pathname) {
+       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);
+       if (!pathname) {
+               ret = -1;
+               goto error;
+       }
+
+       if (is_local_trace && trace_chunk) {
+               enum lttng_trace_chunk_status chunk_status;
+               char *pathname_index;
+
+               ret = asprintf(&pathname_index, "%s/" DEFAULT_INDEX_DIR,
+                               pathname);
+               if (ret < 0) {
+                       ERR("Failed to format channel index directory");
+                       ret = -1;
+                       goto error;
+               }
+
+               /*
+                * Create the index subdirectory which will take care
+                * of implicitly creating the channel's path.
+                */
+               chunk_status = lttng_trace_chunk_create_subdirectory(
+                               trace_chunk, pathname_index);
+               free(pathname_index);
+               if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
                        ret = -1;
                        goto error;
                }
@@ -192,8 +206,6 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                        ua_sess->tracing_id,
                        pathname,
                        ua_chan->name,
-                       ua_sess->euid,
-                       ua_sess->egid,
                        consumer->net_seq_index,
                        ua_chan->key,
                        registry->uuid,
@@ -205,7 +217,7 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                        ua_sess->uid,
                        ua_chan->attr.blocking_timeout,
                        root_shm_path, shm_path,
-                       trace_archive_id);
+                       trace_chunk);
 
        health_code_update();
 
@@ -247,7 +259,7 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
                struct consumer_output *consumer,
                struct consumer_socket *socket,
                struct ust_registry_session *registry,
-               uint64_t trace_archive_id)
+               struct lttng_trace_chunk * trace_chunk)
 {
        int ret;
 
@@ -265,7 +277,7 @@ 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,
-                       trace_archive_id);
+                       trace_chunk);
        pthread_mutex_unlock(socket->lock);
        if (ret < 0) {
                ERR("ask_channel_creation consumer command failed");