remove debug

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

diff --git a/src/bin/lttng-sessiond/cmd.c b/src/bin/lttng-sessiond/cmd.c
index 38d0dac58f0935c65651621cf80c7cb72f9d146b..0eba587c133adb20841343840d6902aa075a21bc 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -2438,6 +2438,16 @@ int cmd_start_trace(struct ltt_session *session)
        session->has_been_started = 1;
        session->active = 1;
 
+       if (session->rotate_timer_period) {
+               ret = sessiond_rotate_timer_start(session,
+                               session->rotate_timer_period);
+               if (ret < 0) {
+                       ERR("Failed to enable rotate timer");
+                       ret = LTTNG_ERR_UNK;
+                       goto error;
+               }
+       }
+
        ret = LTTNG_OK;
 
 error:
@@ -2771,6 +2781,10 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe)
                sessiond_timer_rotate_pending_stop(session);
        }
 
+       if (session->rotate_timer_enabled) {
+               sessiond_rotate_timer_stop(session);
+       }
+
        /* Clean kernel session teardown */
        kernel_destroy_session(ksess);
 
@@ -3169,6 +3183,14 @@ int cmd_data_pending(struct ltt_session *session)
                }
        }
 
+       /*
+        * A rotation is still pending, we have to wait.
+        */
+       if (session->rotate_pending) {
+               ret = 1;
+               goto error;
+       }
+
        if (ksess && ksess->consumer) {
                ret = consumer_is_data_pending(ksess->id, ksess->consumer);
                if (ret == 1) {
@@ -4152,6 +4174,7 @@ const char *get_base_path(struct ltt_session *session,
  * Command LTTNG_ROTATE_SESSION from the lttng-ctl library.
  *
  * Ask the consumer to rotate the session output directory.
+ * The session lock must be held.
  *
  * Return 0 on success or else a LTTNG_ERR code.
  */
@@ -4165,10 +4188,12 @@ int cmd_rotate_session(struct ltt_session *session,
 
        assert(session);
 
-       *rotate_return = zmalloc(sizeof(struct lttng_rotate_session_return));
-       if (!*rotate_return) {
-               ret = -ENOMEM;
-               goto end;
+       if (rotate_return) {
+               *rotate_return = zmalloc(sizeof(struct lttng_rotate_session_return));
+               if (!*rotate_return) {
+                       ret = -ENOMEM;
+                       goto end;
+               }
        }
 
        if (session->live_timer || session->snapshot_mode ||
@@ -4198,7 +4223,6 @@ int cmd_rotate_session(struct ltt_session *session,
                snprintf(session->rotation_chunk.current_rotate_path,
                                PATH_MAX, "%s",
                                base_path);
-               fprintf(stderr, "b: %s\n", base_path);
        } else {
                /*
                 * The currently active tracing path is now the folder we
@@ -4228,14 +4252,21 @@ int cmd_rotate_session(struct ltt_session *session,
        timeinfo = localtime(&now);
        strftime(datetime, sizeof(datetime), "%Y%m%d-%H%M%S", timeinfo);
        if (session->kernel_session) {
-               /* The active path for the next rotation/destroy. */
+               /*
+                * The active path for the next rotation/destroy.
+                * Ex: ~/lttng-traces/auto-20170922-111748/20170922-111754-42
+                */
                snprintf(session->rotation_chunk.active_tracing_path,
-                               PATH_MAX, "%s/%s-",
+                               PATH_MAX, "%s/%s-%" PRIu64,
                                get_base_path(session, session->kernel_session->consumer),
-                               datetime);
-               /* The sub-directory for the consumer. */
+                               datetime, session->rotate_count + 1);
+               /*
+                * The sub-directory for the consumer
+                * Ex: /20170922-111754-42/kernel
+                */
                snprintf(session->kernel_session->consumer->chunk_path,
-                               PATH_MAX, "/%s-%s", datetime,
+                               PATH_MAX, "/%s-%" PRIu64 "%s", datetime,
+                               session->rotate_count + 1,
                                session->kernel_session->consumer->subdir);
                ret = kernel_rotate_session(session);
                if (ret != LTTNG_OK) {
@@ -4244,19 +4275,22 @@ int cmd_rotate_session(struct ltt_session *session,
        }
        if (session->ust_session) {
                snprintf(session->rotation_chunk.active_tracing_path,
-                               PATH_MAX, "%s/%s-",
+                               PATH_MAX, "%s/%s-%" PRIu64,
                                get_base_path(session, session->ust_session->consumer),
-                               datetime);
+                               datetime, session->rotate_count + 1);
                snprintf(session->ust_session->consumer->chunk_path,
-                               PATH_MAX, "/%s-", datetime);
+                               PATH_MAX, "/%s-%" PRIu64, datetime,
+                               session->rotate_count + 1);
                ret = ust_app_rotate_session(session);
                if (ret != LTTNG_OK) {
                        goto error;
                }
        }
 
-       (*rotate_return)->rotate_id = session->rotate_count;
-       (*rotate_return)->status = LTTNG_ROTATE_STARTED;
+       if (rotate_return) {
+               (*rotate_return)->rotate_id = session->rotate_count;
+               (*rotate_return)->status = LTTNG_ROTATE_STARTED;
+       }
 
        DBG("Cmd rotate session %s, rotate_id %" PRIu64, session->name,
                        session->rotate_count);
@@ -4265,7 +4299,9 @@ int cmd_rotate_session(struct ltt_session *session,
        goto end;
 
 error:
-       (*rotate_return)->status = LTTNG_ROTATE_ERROR;
+       if (rotate_return) {
+               (*rotate_return)->status = LTTNG_ROTATE_ERROR;
+       }
 end:
        return ret;
 }
@@ -4331,6 +4367,59 @@ end:
        return ret;
 }
 
+/*
+ * Command LTTNG_ROTATE_SETUP from the lttng-ctl library.
+ *
+ * Configure the automatic rotation parameters.
+ *
+ * Return 0 on success or else a LTTNG_ERR code.
+ */
+int cmd_rotate_setup(struct ltt_session *session,
+               uint64_t timer_us, uint64_t size)
+{
+       int ret;
+
+       assert(session);
+
+       DBG("Cmd rotate setup session %s", session->name);
+
+       if (timer_us && session->rotate_timer_period) {
+               ret = LTTNG_ERR_ROTATE_TIMER_EXISTS;
+               goto end;
+       }
+
+       if (size && session->rotate_size) {
+               ret = LTTNG_ERR_ROTATE_SIZE_EXISTS;
+               goto end;
+       }
+
+       if (timer_us && !session->rotate_timer_period) {
+               session->rotate_timer_period = timer_us;
+               /*
+                * Only start the timer if the session is active, otherwise
+                * it will be started when the session starts.
+                */
+               if (session->active) {
+                       ret = sessiond_rotate_timer_start(session, timer_us);
+                       if (ret) {
+                               ERR("Failed to enable rotate timer");
+                               ret = LTTNG_ERR_UNK;
+                               goto end;
+                       }
+               }
+       } else if (timer_us == -1ULL && session->rotate_timer_period > 0) {
+               sessiond_rotate_timer_stop(session);
+       }
+       session->rotate_size = size;
+
+       ret = LTTNG_OK;
+
+       goto end;
+
+end:
+       return ret;
+}
+
 /*
  * Init command subsystem.
  */