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

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

diff --git a/src/bin/lttng-sessiond/kernel.c b/src/bin/lttng-sessiond/kernel.c
index 9268a277956aab08ff2d1d04d2e93258c4e3ce5e..c395f425542abe4bffe9f6ecfcf28a6f97e67be0 100644 (file)
--- a/src/bin/lttng-sessiond/kernel.c
+++ b/src/bin/lttng-sessiond/kernel.c
@@ -1250,8 +1250,6 @@ enum lttng_error_code kernel_snapshot_record(
        struct consumer_socket *socket;
        struct lttng_ht_iter iter;
        struct ltt_kernel_metadata *saved_metadata;
-       struct ltt_session *session = NULL;
-       uint64_t trace_archive_id;
 
        assert(ksess);
        assert(ksess->consumer);
@@ -1259,12 +1257,6 @@ enum lttng_error_code kernel_snapshot_record(
 
        DBG("Kernel snapshot record started");
 
-       session = session_find_by_id(ksess->id);
-       assert(session);
-       assert(pthread_mutex_trylock(&session->lock));
-       assert(session_trylock_list());
-       trace_archive_id = session->current_archive_id;
-
        /* Save current metadata since the following calls will change it. */
        saved_metadata = ksess->metadata;
        saved_metadata_fd = ksess->metadata_stream_fd;
@@ -1312,8 +1304,7 @@ enum lttng_error_code kernel_snapshot_record(
                        status = consumer_snapshot_channel(socket, chan->key, output, 0,
                                        ksess->uid, ksess->gid,
                                        DEFAULT_KERNEL_TRACE_DIR, wait,
-                                       nb_packets_per_stream,
-                                       trace_archive_id);
+                                       nb_packets_per_stream);
                        if (status != LTTNG_OK) {
                                (void) kernel_consumer_destroy_metadata(socket,
                                                ksess->metadata);
@@ -1324,8 +1315,7 @@ enum lttng_error_code kernel_snapshot_record(
                /* Snapshot metadata, */
                status = consumer_snapshot_channel(socket, ksess->metadata->key, output,
                                1, ksess->uid, ksess->gid,
-                               DEFAULT_KERNEL_TRACE_DIR, wait, 0,
-                               trace_archive_id);
+                               DEFAULT_KERNEL_TRACE_DIR, wait, 0);
                if (status != LTTNG_OK) {
                        goto error_consumer;
                }
@@ -1350,9 +1340,6 @@ error:
        /* Restore metadata state.*/
        ksess->metadata = saved_metadata;
        ksess->metadata_stream_fd = saved_metadata_fd;
-       if (session) {
-               session_put(session);
-       }
        rcu_read_unlock();
        return status;
 }
@@ -1432,15 +1419,13 @@ enum lttng_error_code kernel_rotate_session(struct ltt_session *session)
                        socket, node.node) {
                struct ltt_kernel_channel *chan;
 
-               /* For each channel, ask the consumer to rotate it. */
+                /* For each channel, ask the consumer to rotate it. */
                cds_list_for_each_entry(chan, &ksess->channel_list.head, list) {
                        DBG("Rotate kernel channel %" PRIu64 ", session %s",
                                        chan->key, session->name);
                        ret = consumer_rotate_channel(socket, chan->key,
                                        ksess->uid, ksess->gid, ksess->consumer,
-                                       ksess->consumer->domain_subdir,
-                                       /* is_metadata_channel */ false,
-                                       session->current_archive_id);
+                                       /* is_metadata_channel */ false);
                        if (ret < 0) {
                                status = LTTNG_ERR_KERN_CONSUMER_FAIL;
                                goto error;
@@ -1452,9 +1437,7 @@ enum lttng_error_code kernel_rotate_session(struct ltt_session *session)
                 */
                ret = consumer_rotate_channel(socket, ksess->metadata->key,
                                ksess->uid, ksess->gid, ksess->consumer,
-                               ksess->consumer->domain_subdir,
-                               /* is_metadata_channel */ true,
-                               session->current_archive_id);
+                               /* is_metadata_channel */ true);
                if (ret < 0) {
                        status = LTTNG_ERR_KERN_CONSUMER_FAIL;
                        goto error;
@@ -1465,3 +1448,28 @@ error:
        rcu_read_unlock();
        return status;
 }
+
+enum lttng_error_code kernel_create_channel_subdirectories(
+               const struct ltt_kernel_session *ksess)
+{
+       enum lttng_error_code ret = LTTNG_OK;
+       enum lttng_trace_chunk_status chunk_status;
+
+       rcu_read_lock();
+       assert(ksess->current_trace_chunk);
+
+       /*
+        * Create the index subdirectory which will take care
+        * of implicitly creating the channel's path.
+        */
+       chunk_status = lttng_trace_chunk_create_subdirectory(
+                       ksess->current_trace_chunk,
+                       DEFAULT_KERNEL_TRACE_DIR "/" DEFAULT_INDEX_DIR);
+       if (chunk_status != LTTNG_TRACE_CHUNK_STATUS_OK) {
+               ret = LTTNG_ERR_CREATE_DIR_FAIL;
+               goto error;
+       }
+error:
+       rcu_read_unlock();
+       return ret;
+}