X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fstart-session.c;h=7920982588e96e55e18017a76bb918294b5cdfea;hb=0f7c296359bf90005e1dadf2d7a02a4b223a8031;hp=28dc27f82a68cf8206d1da0f10dc944e1dcb4b47;hpb=1345b16b6f9644d3195467cf701d0296ca917d6e;p=lttng-tools.git diff --git a/src/common/actions/start-session.c b/src/common/actions/start-session.c index 28dc27f82..792098258 100644 --- a/src/common/actions/start-session.c +++ b/src/common/actions/start-session.c @@ -8,9 +8,10 @@ #include #include #include +#include #include -#include -#include +#include +#include #include #include @@ -22,7 +23,7 @@ struct lttng_action_start_session { /* Owned by this. */ char *session_name; - struct lttng_firing_policy *policy; + struct lttng_rate_policy *policy; }; struct lttng_action_start_session_comm { @@ -38,6 +39,10 @@ struct lttng_action_start_session_comm { char data[]; } LTTNG_PACKED; +static const struct lttng_rate_policy * +lttng_action_start_session_internal_get_rate_policy( + const struct lttng_action *action); + static struct lttng_action_start_session *action_start_session_from_action( struct lttng_action *action) { @@ -94,7 +99,7 @@ static bool lttng_action_start_session_is_equal( goto end; } - is_equal = lttng_firing_policy_is_equal(a->policy, b->policy); + is_equal = lttng_rate_policy_is_equal(a->policy, b->policy); end: return is_equal; } @@ -133,7 +138,7 @@ static int lttng_action_start_session_serialize( goto end; } - ret = lttng_firing_policy_serialize( + ret = lttng_rate_policy_serialize( action_start_session->policy, payload); if (ret) { ret = -1; @@ -155,7 +160,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); + lttng_rate_policy_destroy(action_start_session->policy); free(action_start_session->session_name); free(action_start_session); @@ -172,7 +177,7 @@ ssize_t lttng_action_start_session_create_from_payload( const char *session_name; struct lttng_action *action = NULL; enum lttng_action_status status; - struct lttng_firing_policy *policy = NULL; + struct lttng_rate_policy *policy = NULL; comm = (typeof(comm)) view->buffer.data; session_name = (const char *) &comm->data; @@ -185,12 +190,12 @@ ssize_t lttng_action_start_session_create_from_payload( } consumed_len = sizeof(*comm) + comm->session_name_len; - /* Firing policy. */ + /* Rate policy. */ { struct lttng_payload_view policy_view = lttng_payload_view_from_view( view, consumed_len, -1); - ret = lttng_firing_policy_create_from_payload( + ret = lttng_rate_policy_create_from_payload( &policy_view, &policy); if (ret < 0) { consumed_len = -1; @@ -213,7 +218,7 @@ ssize_t lttng_action_start_session_create_from_payload( } assert(policy); - status = lttng_action_start_session_set_firing_policy(action, policy); + status = lttng_action_start_session_set_rate_policy(action, policy); if (status != LTTNG_ACTION_STATUS_OK) { consumed_len = -1; goto end; @@ -223,20 +228,76 @@ ssize_t lttng_action_start_session_create_from_payload( action = NULL; end: - lttng_firing_policy_destroy(policy); + lttng_rate_policy_destroy(policy); lttng_action_start_session_destroy(action); return consumed_len; } +static enum lttng_error_code lttng_action_start_session_mi_serialize( + const struct lttng_action *action, struct mi_writer *writer) +{ + int ret; + enum lttng_error_code ret_code; + enum lttng_action_status status; + const char *session_name = NULL; + const struct lttng_rate_policy *policy = NULL; + + assert(action); + assert(IS_START_SESSION_ACTION(action)); + + status = lttng_action_start_session_get_session_name( + action, &session_name); + assert(status == LTTNG_ACTION_STATUS_OK); + assert(session_name != NULL); + + status = lttng_action_start_session_get_rate_policy(action, &policy); + assert(status == LTTNG_ACTION_STATUS_OK); + assert(policy != NULL); + + /* Open action start session element. */ + ret = mi_lttng_writer_open_element( + writer, mi_lttng_element_action_start_session); + if (ret) { + goto mi_error; + } + + /* Session name. */ + ret = mi_lttng_writer_write_element_string( + writer, mi_lttng_element_session_name, session_name); + if (ret) { + goto mi_error; + } + + /* Rate policy. */ + ret_code = lttng_rate_policy_mi_serialize(policy, writer); + if (ret_code != LTTNG_OK) { + goto end; + } + + /* Close action start session element. */ + ret = mi_lttng_writer_close_element(writer); + if (ret) { + goto mi_error; + } + + ret_code = LTTNG_OK; + goto end; + +mi_error: + ret_code = LTTNG_ERR_MI_IO_FAIL; +end: + return ret_code; +} + struct lttng_action *lttng_action_start_session_create(void) { struct lttng_action *action = NULL; - struct lttng_firing_policy *policy = NULL; + struct lttng_rate_policy *policy = NULL; enum lttng_action_status status; - /* Create a every N = 1 firing policy. */ - policy = lttng_firing_policy_every_n_create(1); + /* Create a every N = 1 rate policy. */ + policy = lttng_rate_policy_every_n_create(1); if (!policy) { goto end; } @@ -250,9 +311,12 @@ struct lttng_action *lttng_action_start_session_create(void) lttng_action_start_session_validate, lttng_action_start_session_serialize, lttng_action_start_session_is_equal, - lttng_action_start_session_destroy); + lttng_action_start_session_destroy, + lttng_action_start_session_internal_get_rate_policy, + lttng_action_generic_add_error_query_results, + lttng_action_start_session_mi_serialize); - status = lttng_action_start_session_set_firing_policy(action, policy); + status = lttng_action_start_session_set_rate_policy(action, policy); if (status != LTTNG_ACTION_STATUS_OK) { free(action); action = NULL; @@ -260,7 +324,7 @@ struct lttng_action *lttng_action_start_session_create(void) } end: - lttng_firing_policy_destroy(policy); + lttng_rate_policy_destroy(policy); return action; } @@ -311,20 +375,20 @@ end: return status; } -enum lttng_action_status lttng_action_start_session_set_firing_policy( +enum lttng_action_status lttng_action_start_session_set_rate_policy( struct lttng_action *action, - const struct lttng_firing_policy *policy) + const struct lttng_rate_policy *policy) { enum lttng_action_status status; struct lttng_action_start_session *start_session_action; - struct lttng_firing_policy *copy = NULL; + struct lttng_rate_policy *copy = NULL; if (!action || !policy || !IS_START_SESSION_ACTION(action)) { status = LTTNG_ACTION_STATUS_INVALID; goto end; } - copy = lttng_firing_policy_copy(policy); + copy = lttng_rate_policy_copy(policy); if (!copy) { status = LTTNG_ACTION_STATUS_ERROR; goto end; @@ -332,8 +396,8 @@ enum lttng_action_status lttng_action_start_session_set_firing_policy( start_session_action = action_start_session_from_action(action); - /* Release the previous firing policy .*/ - lttng_firing_policy_destroy(start_session_action->policy); + /* Release the previous rate policy .*/ + lttng_rate_policy_destroy(start_session_action->policy); /* Assign the policy. */ start_session_action->policy = copy; @@ -341,13 +405,13 @@ enum lttng_action_status lttng_action_start_session_set_firing_policy( copy = NULL; end: - lttng_firing_policy_destroy(copy); + lttng_rate_policy_destroy(copy); return status; } -enum lttng_action_status lttng_action_start_session_get_firing_policy( +enum lttng_action_status lttng_action_start_session_get_rate_policy( const struct lttng_action *action, - const struct lttng_firing_policy **policy) + const struct lttng_rate_policy **policy) { enum lttng_action_status status; const struct lttng_action_start_session *start_session_action; @@ -364,3 +428,13 @@ enum lttng_action_status lttng_action_start_session_get_firing_policy( end: return status; } + +static const struct lttng_rate_policy * +lttng_action_start_session_internal_get_rate_policy( + const struct lttng_action *action) +{ + const struct lttng_action_start_session *_action; + _action = action_start_session_from_action_const(action); + + return _action->policy; +}