rotate timer working

[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 88f33c1568a77b21630f57d9486deafd61536763..f2b7163d4a4426fbdd13372089f55f792fde3e66 100644 (file)
--- a/src/bin/lttng-sessiond/cmd.c
+++ b/src/bin/lttng-sessiond/cmd.c
@@ -53,6 +53,7 @@
 #include "notification-thread-commands.h"
 #include "rotate.h"
 #include "rotation-thread.h"
+#include "sessiond-timer.h"
 
 #include "cmd.h"
 
@@ -2433,6 +2434,16 @@ int cmd_start_trace(struct ltt_session *session)
                }
        }
 
+       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;
+               }
+       }
+
        /* Flag this after a successful start. */
        session->has_been_started = 1;
        session->active = 1;
@@ -2766,6 +2777,14 @@ int cmd_destroy_session(struct ltt_session *session, int wpipe)
                }
        }
 
+       if (session->rotate_relay_pending_timer_enabled) {
+               sessiond_timer_rotate_pending_stop(session);
+       }
+
+       if (session->rotate_timer_enabled) {
+               sessiond_rotate_timer_stop(session);
+       }
+
        /* Clean kernel session teardown */
        kernel_destroy_session(ksess);
 
@@ -4160,10 +4179,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 ||
@@ -4172,7 +4193,7 @@ int cmd_rotate_session(struct ltt_session *session,
                goto error;
        }
 
-       if (session->rotate_pending) {
+       if (session->rotate_pending || session->rotate_pending_relay) {
                ret = -LTTNG_ERR_ROTATE_PENDING;
                goto error;
        }
@@ -4206,6 +4227,7 @@ int cmd_rotate_session(struct ltt_session *session,
 
        session->rotate_count++;
        session->rotate_pending = true;
+       session->rotate_pending_relay_check_in_progress = false;
        session->rotate_status = LTTNG_ROTATE_STARTED;
 
        /*
@@ -4249,8 +4271,10 @@ int cmd_rotate_session(struct ltt_session *session,
                }
        }
 
-       (*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);
@@ -4259,7 +4283,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;
 }
@@ -4302,37 +4328,9 @@ int cmd_rotate_pending(struct ltt_session *session,
                (*pending_return)->status = LTTNG_ROTATE_EMPTY;
        /* Rotate with a relay */
        } else if (session->rotate_pending_relay) {
-               /* The consumer has not finished the rotation. */
-               if (session->rotate_pending) {
-                       DBG("Session %s, rotate_id %" PRIu64 " still pending",
-                                       session->name, session->rotate_count);
-                       (*pending_return)->status = LTTNG_ROTATE_STARTED;
-               } else {
-                       /*
-                        * The consumer finished the rotation, but we don't
-                        * know if the relay still has data pending. We need
-                        * to find one consumer_output to talk to the relay
-                        * and ask it.
-                        */
-                       ret = relay_rotate_pending(session);
-                       if (ret == 0) {
-                               DBG("Rotate completed on the relay for session %s"
-                                               ", rotate_id %" PRIu64,
-                                               session->name,
-                                               session->rotate_count);
-                               (*pending_return)->status = LTTNG_ROTATE_COMPLETED;
-                               snprintf((*pending_return)->output_path, PATH_MAX, "%s",
-                                               session->rotation_chunk.current_rotate_path);
-                       } else if (ret == 1) {
-                               DBG("Session %s, rotate_id %" PRIu64 " still pending "
-                                               "on the relay",
-                                               session->name, session->rotate_count);
-                               (*pending_return)->status = LTTNG_ROTATE_STARTED;
-                       } else {
-                               ERR("Failed to check rotate pending on the relay");
-                               (*pending_return)->status = LTTNG_ROTATE_ERROR;
-                       }
-               }
+               DBG("Session %s, rotate_id %" PRIu64 " still pending",
+                               session->name, session->rotate_count);
+               (*pending_return)->status = LTTNG_ROTATE_STARTED;
        } else if (session->rotate_pending) {
                DBG("Session %s, rotate_id %" PRIu64 " still pending",
                                session->name, session->rotate_count);
@@ -4353,6 +4351,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.
  */