Snapshot: record: use same datetime for snapshot folder output

Make sure that the ust snapshot is put under the same folder as the
kernel snapshot.

Fixes #970

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 9362833c931fcb9fdcd5f9a82660e7260c24370c..b94fe68da09132baba598728b52dc6340598d1c9 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -3593,13 +3593,6 @@ static int record_kernel_snapshot(struct ltt_kernel_session *ksess,
        assert(output);
        assert(session);
 
        assert(output);
        assert(session);
 

-       /* Get the datetime for the snapshot output directory. */
-       ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
-                       sizeof(output->datetime));
-       if (!ret) {
-               ret = LTTNG_ERR_INVALID;
-               goto error;
-       }

 
        /*
         * Copy kernel session sockets so we can communicate with the right
 
        /*
         * Copy kernel session sockets so we can communicate with the right


@@ -3647,14 +3640,6 @@ static int record_ust_snapshot(struct ltt_ust_session *usess,
        assert(output);
        assert(session);
 
        assert(output);
        assert(session);
 

-       /* Get the datetime for the snapshot output directory. */
-       ret = utils_get_current_time_str("%Y%m%d-%H%M%S", output->datetime,
-                       sizeof(output->datetime));
-       if (!ret) {
-               ret = LTTNG_ERR_INVALID;
-               goto error;
-       }
-

        /*
         * Copy UST session sockets so we can communicate with the right
         * consumer for the snapshot record command.
        /*
         * Copy UST session sockets so we can communicate with the right
         * consumer for the snapshot record command.


@@ -3796,12 +3781,21 @@ int cmd_snapshot_record(struct ltt_session *session,
        unsigned int use_tmp_output = 0;
        struct snapshot_output tmp_output;
        unsigned int snapshot_success = 0;
        unsigned int use_tmp_output = 0;
        struct snapshot_output tmp_output;
        unsigned int snapshot_success = 0;

+       char datetime[16];

 
        assert(session);
        assert(output);
 
        DBG("Cmd snapshot record for session %s", session->name);
 
 
        assert(session);
        assert(output);
 
        DBG("Cmd snapshot record for session %s", session->name);
 

+       /* Get the datetime for the snapshot output directory. */
+       ret = utils_get_current_time_str("%Y%m%d-%H%M%S", datetime,
+                       sizeof(datetime));
+       if (!ret) {
+               ret = LTTNG_ERR_INVALID;
+               goto error;
+       }
+

        /*
         * Permission denied to create an output if the session is not
         * set in no output mode.
        /*
         * Permission denied to create an output if the session is not
         * set in no output mode.


@@ -3832,6 +3826,9 @@ int cmd_snapshot_record(struct ltt_session *session,
                }
                /* Use the global session count for the temporary snapshot. */
                tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
                }
                /* Use the global session count for the temporary snapshot. */
                tmp_output.nb_snapshot = session->snapshot.nb_snapshot;

+
+               /* Use the global datetime */
+               memcpy(tmp_output.datetime, datetime, sizeof(datetime));

                use_tmp_output = 1;
        }
 
                use_tmp_output = 1;
        }
 


@@ -3899,6 +3896,7 @@ int cmd_snapshot_record(struct ltt_session *session,
                        }
 
                        tmp_output.nb_snapshot = session->snapshot.nb_snapshot;
                        }
 
                        tmp_output.nb_snapshot = session->snapshot.nb_snapshot;

+                       memcpy(tmp_output.datetime, datetime, sizeof(datetime));

 
                        if (session->kernel_session) {
                                ret = record_kernel_snapshot(session->kernel_session,
 
                        if (session->kernel_session) {
                                ret = record_kernel_snapshot(session->kernel_session,