Implement firing policy for the start session action

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

diff --git a/include/lttng/action/start-session.h b/include/lttng/action/start-session.h
index b2ba470a2e5cea66e77e6289105a9430900d7003..dc54219ae50945bacb49485fc592d9ee4a0708b1 100644 (file)
--- a/include/lttng/action/start-session.h
+++ b/include/lttng/action/start-session.h
@@ -9,6 +9,7 @@
 #define LTTNG_ACTION_START_SESSION_H
 
 struct lttng_action;
+struct lttng_firing_policy;
 
 #ifdef __cplusplus
 extern "C" {
@@ -40,6 +41,27 @@ extern enum lttng_action_status lttng_action_start_session_set_session_name(
 extern enum lttng_action_status lttng_action_start_session_get_session_name(
                const struct lttng_action *action, const char **session_name);
 
+/*
+ * Set the firing policy of a start session action.
+ *
+ * Returns LTTNG_ACTION_STATUS_OK on success,
+ * LTTNG_ACTION_STATUS_ERROR on internal error,
+ * LTTNG_ACTION_STATUS_INVALID if invalid parameters are passed.
+ */
+extern enum lttng_action_status lttng_action_start_session_set_firing_policy(
+               struct lttng_action *action,
+               const struct lttng_firing_policy *policy);
+
+/*
+ * Get the firing policy of a start session action.
+ *
+ * Returns LTTNG_ACTION_STATUS_OK on success,
+ * LTTNG_ACTION_STATUS_INVALID if invalid parameters are passed.
+ */
+extern enum lttng_action_status lttng_action_start_session_get_firing_policy(
+               const struct lttng_action *action,
+               const struct lttng_firing_policy **policy);
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/src/common/actions/start-session.c b/src/common/actions/start-session.c
index f21aaaae97448f13d3b7c13f0c19b1d1bfeb92f3..28dc27f82a68cf8206d1da0f10dc944e1dcb4b47 100644 (file)
--- a/src/common/actions/start-session.c
+++ b/src/common/actions/start-session.c
@@ -9,6 +9,8 @@
 #include <common/error.h>
 #include <common/macros.h>
 #include <lttng/action/action-internal.h>
+#include <lttng/action/firing-policy-internal.h>
+#include <lttng/action/firing-policy.h>
 #include <lttng/action/start-session-internal.h>
 #include <lttng/action/start-session.h>
 
@@ -20,6 +22,7 @@ struct lttng_action_start_session {
 
        /* Owned by this. */
        char *session_name;
+       struct lttng_firing_policy *policy;
 };
 
 struct lttng_action_start_session_comm {
@@ -30,6 +33,7 @@ struct lttng_action_start_session_comm {
         * Variable data:
         *
         *  - session name (null terminated)
+        *  - policy
         */
        char data[];
 } LTTNG_PACKED;
@@ -90,7 +94,7 @@ static bool lttng_action_start_session_is_equal(
                goto end;
        }
 
-       is_equal = true;
+       is_equal = lttng_firing_policy_is_equal(a->policy, b->policy);
 end:
        return is_equal;
 }
@@ -129,6 +133,13 @@ static int lttng_action_start_session_serialize(
                goto end;
        }
 
+       ret = lttng_firing_policy_serialize(
+                       action_start_session->policy, payload);
+       if (ret) {
+               ret = -1;
+               goto end;
+       }
+
        ret = 0;
 end:
        return ret;
@@ -144,6 +155,7 @@ static void lttng_action_start_session_destroy(struct lttng_action *action)
 
        action_start_session = action_start_session_from_action(action);
 
+       lttng_firing_policy_destroy(action_start_session->policy);
        free(action_start_session->session_name);
        free(action_start_session);
 
@@ -155,26 +167,43 @@ ssize_t lttng_action_start_session_create_from_payload(
                struct lttng_payload_view *view,
                struct lttng_action **p_action)
 {
-       ssize_t consumed_len;
+       ssize_t consumed_len, ret;
        const struct lttng_action_start_session_comm *comm;
        const char *session_name;
-       struct lttng_action *action;
+       struct lttng_action *action = NULL;
        enum lttng_action_status status;
-
-       action = lttng_action_start_session_create();
-       if (!action) {
-               consumed_len = -1;
-               goto end;
-       }
+       struct lttng_firing_policy *policy = NULL;
 
        comm = (typeof(comm)) view->buffer.data;
        session_name = (const char *) &comm->data;
 
+       /* Session name */
        if (!lttng_buffer_view_contains_string(&view->buffer, session_name,
                            comm->session_name_len)) {
                consumed_len = -1;
                goto end;
        }
+       consumed_len = sizeof(*comm) + comm->session_name_len;
+
+       /* Firing policy. */
+       {
+               struct lttng_payload_view policy_view =
+                               lttng_payload_view_from_view(
+                                               view, consumed_len, -1);
+               ret = lttng_firing_policy_create_from_payload(
+                               &policy_view, &policy);
+               if (ret < 0) {
+                       consumed_len = -1;
+                       goto end;
+               }
+               consumed_len += ret;
+       }
+
+       action = lttng_action_start_session_create();
+       if (!action) {
+               consumed_len = -1;
+               goto end;
+       }
 
        status = lttng_action_start_session_set_session_name(
                        action, session_name);
@@ -183,11 +212,18 @@ ssize_t lttng_action_start_session_create_from_payload(
                goto end;
        }
 
-       consumed_len = sizeof(*comm) + comm->session_name_len;
+       assert(policy);
+       status = lttng_action_start_session_set_firing_policy(action, policy);
+       if (status != LTTNG_ACTION_STATUS_OK) {
+               consumed_len = -1;
+               goto end;
+       }
+
        *p_action = action;
        action = NULL;
 
 end:
+       lttng_firing_policy_destroy(policy);
        lttng_action_start_session_destroy(action);
 
        return consumed_len;
@@ -195,7 +231,15 @@ end:
 
 struct lttng_action *lttng_action_start_session_create(void)
 {
-       struct lttng_action *action;
+       struct lttng_action *action = NULL;
+       struct lttng_firing_policy *policy = NULL;
+       enum lttng_action_status status;
+
+       /* Create a every N = 1 firing policy. */
+       policy = lttng_firing_policy_every_n_create(1);
+       if (!policy) {
+               goto end;
+       }
 
        action = zmalloc(sizeof(struct lttng_action_start_session));
        if (!action) {
@@ -208,7 +252,15 @@ struct lttng_action *lttng_action_start_session_create(void)
                        lttng_action_start_session_is_equal,
                        lttng_action_start_session_destroy);
 
+       status = lttng_action_start_session_set_firing_policy(action, policy);
+       if (status != LTTNG_ACTION_STATUS_OK) {
+               free(action);
+               action = NULL;
+               goto end;
+       }
+
 end:
+       lttng_firing_policy_destroy(policy);
        return action;
 }
 
@@ -258,3 +310,57 @@ enum lttng_action_status lttng_action_start_session_get_session_name(
 end:
        return status;
 }
+
+enum lttng_action_status lttng_action_start_session_set_firing_policy(
+               struct lttng_action *action,
+               const struct lttng_firing_policy *policy)
+{
+       enum lttng_action_status status;
+       struct lttng_action_start_session *start_session_action;
+       struct lttng_firing_policy *copy = NULL;
+
+       if (!action || !policy || !IS_START_SESSION_ACTION(action)) {
+               status = LTTNG_ACTION_STATUS_INVALID;
+               goto end;
+       }
+
+       copy = lttng_firing_policy_copy(policy);
+       if (!copy) {
+               status = LTTNG_ACTION_STATUS_ERROR;
+               goto end;
+       }
+
+       start_session_action = action_start_session_from_action(action);
+
+       /* Release the previous firing policy .*/
+       lttng_firing_policy_destroy(start_session_action->policy);
+
+       /* Assign the policy. */
+       start_session_action->policy = copy;
+       status = LTTNG_ACTION_STATUS_OK;
+       copy = NULL;
+
+end:
+       lttng_firing_policy_destroy(copy);
+       return status;
+}
+
+enum lttng_action_status lttng_action_start_session_get_firing_policy(
+               const struct lttng_action *action,
+               const struct lttng_firing_policy **policy)
+{
+       enum lttng_action_status status;
+       const struct lttng_action_start_session *start_session_action;
+
+       if (!action || !policy || !IS_START_SESSION_ACTION(action)) {
+               status = LTTNG_ACTION_STATUS_INVALID;
+               goto end;
+       }
+
+       start_session_action = action_start_session_from_action_const(action);
+
+       *policy = start_session_action->policy;
+       status = LTTNG_ACTION_STATUS_OK;
+end:
+       return status;
+}