X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fstart-session.c;h=28dc27f82a68cf8206d1da0f10dc944e1dcb4b47;hp=d4095526e8ae0413a0a9b0605c8f887a722e6392;hb=1345b16b6f9644d3195467cf701d0296ca917d6e;hpb=58397d0d83913a52d42e1fe9b9a09f4ebdde8f27 diff --git a/src/common/actions/start-session.c b/src/common/actions/start-session.c index d4095526e..28dc27f82 100644 --- a/src/common/actions/start-session.c +++ b/src/common/actions/start-session.c @@ -9,17 +9,20 @@ #include #include #include +#include +#include #include #include #define IS_START_SESSION_ACTION(action) \ - (lttng_action_get_type_const(action) == LTTNG_ACTION_TYPE_START_SESSION) + (lttng_action_get_type(action) == LTTNG_ACTION_TYPE_START_SESSION) struct lttng_action_start_session { struct lttng_action parent; /* 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,13 +94,13 @@ 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; } static int lttng_action_start_session_serialize( - struct lttng_action *action, struct lttng_dynamic_buffer *buf) + struct lttng_action *action, struct lttng_payload *payload) { struct lttng_action_start_session *action_start_session; struct lttng_action_start_session_comm comm; @@ -104,7 +108,7 @@ static int lttng_action_start_session_serialize( int ret; assert(action); - assert(buf); + assert(payload); action_start_session = action_start_session_from_action(action); @@ -116,19 +120,26 @@ static int lttng_action_start_session_serialize( session_name_len = strlen(action_start_session->session_name) + 1; comm.session_name_len = session_name_len; - ret = lttng_dynamic_buffer_append(buf, &comm, sizeof(comm)); + ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, sizeof(comm)); if (ret) { ret = -1; goto end; } - ret = lttng_dynamic_buffer_append(buf, + ret = lttng_dynamic_buffer_append(&payload->buffer, action_start_session->session_name, session_name_len); if (ret) { ret = -1; 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); @@ -151,27 +163,44 @@ end: return; } -ssize_t lttng_action_start_session_create_from_buffer( - const struct lttng_buffer_view *view, +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; + struct lttng_firing_policy *policy = NULL; - action = lttng_action_start_session_create(); - if (!action) { + 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; + } - comm = (const struct lttng_action_start_session_comm *) view->data; - session_name = (const char *) &comm->data; - - if (!lttng_buffer_view_contains_string( - view, session_name, comm->session_name_len)) { + action = lttng_action_start_session_create(); + if (!action) { consumed_len = -1; goto end; } @@ -183,12 +212,18 @@ ssize_t lttng_action_start_session_create_from_buffer( goto end; } - consumed_len = sizeof(struct lttng_action_start_session_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; @@ -196,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) { @@ -209,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; } @@ -259,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; +}