From c2c584344de5929117f84f3a2a9ad3f5e3c578ca Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Wed, 7 Apr 2021 21:02:31 -0400 Subject: [PATCH] Implement firing policy for the rotate session action MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jonathan Rajotte Signed-off-by: Jérémie Galarneau Change-Id: I0e2b50d6653cca7a33abc6ee68bed237950476a9 --- include/lttng/action/rotate-session.h | 22 +++++ src/common/actions/rotate-session.c | 113 ++++++++++++++++++++++++-- 2 files changed, 130 insertions(+), 5 deletions(-) diff --git a/include/lttng/action/rotate-session.h b/include/lttng/action/rotate-session.h index 750c0739a..b05cd8426 100644 --- a/include/lttng/action/rotate-session.h +++ b/include/lttng/action/rotate-session.h @@ -9,6 +9,7 @@ #define LTTNG_ACTION_ROTATE_SESSION_H struct lttng_action; +struct lttng_firing_policy; #ifdef __cplusplus extern "C" { @@ -40,6 +41,27 @@ extern enum lttng_action_status lttng_action_rotate_session_set_session_name( extern enum lttng_action_status lttng_action_rotate_session_get_session_name( const struct lttng_action *action, const char **session_name); +/* + * Set the firing policy of a rotate 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_rotate_session_set_firing_policy( + struct lttng_action *action, + const struct lttng_firing_policy *policy); + +/* + * Get the firing policy of a rotate 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_rotate_session_get_firing_policy( + const struct lttng_action *action, + const struct lttng_firing_policy **policy); + #ifdef __cplusplus } #endif diff --git a/src/common/actions/rotate-session.c b/src/common/actions/rotate-session.c index a49287660..815e919d8 100644 --- a/src/common/actions/rotate-session.c +++ b/src/common/actions/rotate-session.c @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include #include @@ -20,6 +22,7 @@ struct lttng_action_rotate_session { /* Owned by this. */ char *session_name; + struct lttng_firing_policy *policy; }; struct lttng_action_rotate_session_comm { @@ -30,6 +33,7 @@ struct lttng_action_rotate_session_comm { * Variable data: * * - session name (null terminated) + * - policy */ char data[]; } LTTNG_PACKED; @@ -90,7 +94,7 @@ static bool lttng_action_rotate_session_is_equal( goto end; } - is_equal = true; + is_equal = lttng_firing_policy_is_equal(a->policy, b->policy); end: return is_equal; } @@ -129,7 +133,12 @@ static int lttng_action_rotate_session_serialize( goto end; } - ret = 0; + ret = lttng_firing_policy_serialize( + action_rotate_session->policy, payload); + if (ret) { + ret = -1; + goto end; + } end: return ret; } @@ -144,6 +153,7 @@ static void lttng_action_rotate_session_destroy(struct lttng_action *action) action_rotate_session = action_rotate_session_from_action(action); + lttng_firing_policy_destroy(action_rotate_session->policy); free(action_rotate_session->session_name); free(action_rotate_session); @@ -155,11 +165,12 @@ ssize_t lttng_action_rotate_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_rotate_session_comm *comm; const char *session_name; struct lttng_action *action; enum lttng_action_status status; + struct lttng_firing_policy *policy = NULL; action = lttng_action_rotate_session_create(); if (!action) { @@ -175,6 +186,21 @@ ssize_t lttng_action_rotate_session_create_from_payload( 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; + } status = lttng_action_rotate_session_set_session_name( action, session_name); @@ -183,11 +209,18 @@ ssize_t lttng_action_rotate_session_create_from_payload( goto end; } - consumed_len = sizeof(*comm) + comm->session_name_len; + assert(policy); + status = lttng_action_rotate_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_rotate_session_destroy(action); return consumed_len; @@ -195,7 +228,15 @@ end: struct lttng_action *lttng_action_rotate_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_rotate_session)); if (!action) { @@ -208,7 +249,15 @@ struct lttng_action *lttng_action_rotate_session_create(void) lttng_action_rotate_session_is_equal, lttng_action_rotate_session_destroy); + status = lttng_action_rotate_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 +307,57 @@ enum lttng_action_status lttng_action_rotate_session_get_session_name( end: return status; } + +enum lttng_action_status lttng_action_rotate_session_set_firing_policy( + struct lttng_action *action, + const struct lttng_firing_policy *policy) +{ + enum lttng_action_status status; + struct lttng_action_rotate_session *rotate_session_action; + struct lttng_firing_policy *copy = NULL; + + if (!action || !policy || !IS_ROTATE_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; + } + + rotate_session_action = action_rotate_session_from_action(action); + + /* Free the previous firing policy .*/ + lttng_firing_policy_destroy(rotate_session_action->policy); + + /* Assign the policy. */ + rotate_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_rotate_session_get_firing_policy( + const struct lttng_action *action, + const struct lttng_firing_policy **policy) +{ + enum lttng_action_status status; + const struct lttng_action_rotate_session *rotate_session_action; + + if (!action || !policy || !IS_ROTATE_SESSION_ACTION(action)) { + status = LTTNG_ACTION_STATUS_INVALID; + goto end; + } + + rotate_session_action = action_rotate_session_from_action_const(action); + + *policy = rotate_session_action->policy; + status = LTTNG_ACTION_STATUS_OK; +end: + return status; +} -- 2.34.1