X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Frotate-session.cpp;h=8997542e9358a91f074a821d5db3182af380b5e8;hb=HEAD;hp=a8e882b4faa4e175ca113ebb3821e7db441d0784;hpb=64803277bbdbe0a943360d918298a48157d9da55;p=lttng-tools.git diff --git a/src/common/actions/rotate-session.cpp b/src/common/actions/rotate-session.cpp index a8e882b4f..8997542e9 100644 --- a/src/common/actions/rotate-session.cpp +++ b/src/common/actions/rotate-session.cpp @@ -8,6 +8,7 @@ #include #include #include + #include #include #include @@ -17,6 +18,7 @@ #define IS_ROTATE_SESSION_ACTION(action) \ (lttng_action_get_type(action) == LTTNG_ACTION_TYPE_ROTATE_SESSION) +namespace { struct lttng_action_rotate_session { struct lttng_action parent; @@ -37,17 +39,17 @@ struct lttng_action_rotate_session_comm { */ char data[]; } LTTNG_PACKED; +} /* namespace */ static const struct lttng_rate_policy * -lttng_action_rotate_session_internal_get_rate_policy( - const struct lttng_action *action); +lttng_action_rotate_session_internal_get_rate_policy(const struct lttng_action *action); -static struct lttng_action_rotate_session *action_rotate_session_from_action( - struct lttng_action *action) +static struct lttng_action_rotate_session * +action_rotate_session_from_action(struct lttng_action *action) { LTTNG_ASSERT(action); - return container_of(action, struct lttng_action_rotate_session, parent); + return lttng::utils::container_of(action, <tng_action_rotate_session::parent); } static const struct lttng_action_rotate_session * @@ -55,7 +57,7 @@ action_rotate_session_from_action_const(const struct lttng_action *action) { LTTNG_ASSERT(action); - return container_of(action, struct lttng_action_rotate_session, parent); + return lttng::utils::container_of(action, <tng_action_rotate_session::parent); } static bool lttng_action_rotate_session_validate(struct lttng_action *action) @@ -72,7 +74,7 @@ static bool lttng_action_rotate_session_validate(struct lttng_action *action) /* A non-empty session name is mandatory. */ if (!action_rotate_session->session_name || - strlen(action_rotate_session->session_name) == 0) { + strlen(action_rotate_session->session_name) == 0) { valid = false; goto end; } @@ -82,8 +84,8 @@ end: return valid; } -static bool lttng_action_rotate_session_is_equal( - const struct lttng_action *_a, const struct lttng_action *_b) +static bool lttng_action_rotate_session_is_equal(const struct lttng_action *_a, + const struct lttng_action *_b) { bool is_equal = false; const struct lttng_action_rotate_session *a, *b; @@ -94,7 +96,7 @@ static bool lttng_action_rotate_session_is_equal( /* Action is not valid if this is not true. */ LTTNG_ASSERT(a->session_name); LTTNG_ASSERT(b->session_name); - if (strcmp(a->session_name, b->session_name)) { + if (strcmp(a->session_name, b->session_name) != 0) { goto end; } @@ -102,8 +104,8 @@ static bool lttng_action_rotate_session_is_equal( end: return is_equal; } -static int lttng_action_rotate_session_serialize( - struct lttng_action *action, struct lttng_payload *payload) +static int lttng_action_rotate_session_serialize(struct lttng_action *action, + struct lttng_payload *payload) { struct lttng_action_rotate_session *action_rotate_session; struct lttng_action_rotate_session_comm comm; @@ -118,27 +120,25 @@ static int lttng_action_rotate_session_serialize( LTTNG_ASSERT(action_rotate_session->session_name); DBG("Serializing rotate session action: session-name: %s", - action_rotate_session->session_name); + action_rotate_session->session_name); session_name_len = strlen(action_rotate_session->session_name) + 1; comm.session_name_len = session_name_len; - ret = lttng_dynamic_buffer_append( - &payload->buffer, &comm, sizeof(comm)); + ret = lttng_dynamic_buffer_append(&payload->buffer, &comm, sizeof(comm)); if (ret) { ret = -1; goto end; } - ret = lttng_dynamic_buffer_append(&payload->buffer, - action_rotate_session->session_name, session_name_len); + ret = lttng_dynamic_buffer_append( + &payload->buffer, action_rotate_session->session_name, session_name_len); if (ret) { ret = -1; goto end; } - ret = lttng_rate_policy_serialize( - action_rotate_session->policy, payload); + ret = lttng_rate_policy_serialize(action_rotate_session->policy, payload); if (ret) { ret = -1; goto end; @@ -165,16 +165,15 @@ end: return; } -ssize_t lttng_action_rotate_session_create_from_payload( - struct lttng_payload_view *view, - struct lttng_action **p_action) +ssize_t lttng_action_rotate_session_create_from_payload(struct lttng_payload_view *view, + struct lttng_action **p_action) { 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_rate_policy *policy = NULL; + struct lttng_rate_policy *policy = nullptr; action = lttng_action_rotate_session_create(); if (!action) { @@ -186,7 +185,7 @@ ssize_t lttng_action_rotate_session_create_from_payload( session_name = (const char *) &comm->data; if (!lttng_buffer_view_contains_string( - &view->buffer, session_name, comm->session_name_len)) { + &view->buffer, session_name, comm->session_name_len)) { consumed_len = -1; goto end; } @@ -195,10 +194,8 @@ ssize_t lttng_action_rotate_session_create_from_payload( /* Rate policy. */ { struct lttng_payload_view policy_view = - lttng_payload_view_from_view( - view, consumed_len, -1); - ret = lttng_rate_policy_create_from_payload( - &policy_view, &policy); + lttng_payload_view_from_view(view, consumed_len, -1); + ret = lttng_rate_policy_create_from_payload(&policy_view, &policy); if (ret < 0) { consumed_len = -1; goto end; @@ -206,8 +203,7 @@ ssize_t lttng_action_rotate_session_create_from_payload( consumed_len += ret; } - status = lttng_action_rotate_session_set_session_name( - action, session_name); + status = lttng_action_rotate_session_set_session_name(action, session_name); if (status != LTTNG_ACTION_STATUS_OK) { consumed_len = -1; goto end; @@ -221,7 +217,7 @@ ssize_t lttng_action_rotate_session_create_from_payload( } *p_action = action; - action = NULL; + action = nullptr; end: lttng_rate_policy_destroy(policy); @@ -230,37 +226,36 @@ end: return consumed_len; } -static enum lttng_error_code lttng_action_rotate_session_mi_serialize( - const struct lttng_action *action, struct mi_writer *writer) +static enum lttng_error_code +lttng_action_rotate_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; + const char *session_name = nullptr; + const struct lttng_rate_policy *policy = nullptr; LTTNG_ASSERT(action); LTTNG_ASSERT(IS_ROTATE_SESSION_ACTION(action)); - status = lttng_action_rotate_session_get_session_name( - action, &session_name); + status = lttng_action_rotate_session_get_session_name(action, &session_name); LTTNG_ASSERT(status == LTTNG_ACTION_STATUS_OK); - LTTNG_ASSERT(session_name != NULL); + LTTNG_ASSERT(session_name != nullptr); status = lttng_action_notify_get_rate_policy(action, &policy); LTTNG_ASSERT(status == LTTNG_ACTION_STATUS_OK); - LTTNG_ASSERT(policy != NULL); + LTTNG_ASSERT(policy != nullptr); /* Open action rotate session element. */ - ret = mi_lttng_writer_open_element( - writer, mi_lttng_element_action_rotate_session); + ret = mi_lttng_writer_open_element(writer, mi_lttng_element_action_rotate_session); if (ret) { goto mi_error; } /* Session name. */ ret = mi_lttng_writer_write_element_string( - writer, mi_lttng_element_session_name, session_name); + writer, mi_lttng_element_session_name, session_name); if (ret) { goto mi_error; } @@ -288,8 +283,8 @@ end: struct lttng_action *lttng_action_rotate_session_create(void) { - struct lttng_action_rotate_session *action_rotate = NULL; - struct lttng_rate_policy *policy = NULL; + struct lttng_action_rotate_session *action_rotate = nullptr; + struct lttng_rate_policy *policy = nullptr; enum lttng_action_status status; /* Create a every N = 1 rate policy. */ @@ -304,20 +299,19 @@ struct lttng_action *lttng_action_rotate_session_create(void) } lttng_action_init(&action_rotate->parent, - LTTNG_ACTION_TYPE_ROTATE_SESSION, - lttng_action_rotate_session_validate, - lttng_action_rotate_session_serialize, - lttng_action_rotate_session_is_equal, - lttng_action_rotate_session_destroy, - lttng_action_rotate_session_internal_get_rate_policy, - lttng_action_generic_add_error_query_results, - lttng_action_rotate_session_mi_serialize); - - status = lttng_action_rotate_session_set_rate_policy( - &action_rotate->parent, policy); + LTTNG_ACTION_TYPE_ROTATE_SESSION, + lttng_action_rotate_session_validate, + lttng_action_rotate_session_serialize, + lttng_action_rotate_session_is_equal, + lttng_action_rotate_session_destroy, + lttng_action_rotate_session_internal_get_rate_policy, + lttng_action_generic_add_error_query_results, + lttng_action_rotate_session_mi_serialize); + + status = lttng_action_rotate_session_set_rate_policy(&action_rotate->parent, policy); if (status != LTTNG_ACTION_STATUS_OK) { lttng_action_destroy(&action_rotate->parent); - action_rotate = NULL; + action_rotate = nullptr; goto end; } @@ -326,14 +320,14 @@ end: return action_rotate ? &action_rotate->parent : nullptr; } -enum lttng_action_status lttng_action_rotate_session_set_session_name( - struct lttng_action *action, const char *session_name) +enum lttng_action_status lttng_action_rotate_session_set_session_name(struct lttng_action *action, + const char *session_name) { struct lttng_action_rotate_session *action_rotate_session; enum lttng_action_status status; if (!action || !IS_ROTATE_SESSION_ACTION(action) || !session_name || - strlen(session_name) == 0) { + strlen(session_name) == 0) { status = LTTNG_ACTION_STATUS_INVALID; goto end; } @@ -353,8 +347,9 @@ end: return status; } -enum lttng_action_status lttng_action_rotate_session_get_session_name( - const struct lttng_action *action, const char **session_name) +enum lttng_action_status +lttng_action_rotate_session_get_session_name(const struct lttng_action *action, + const char **session_name) { const struct lttng_action_rotate_session *action_rotate_session; enum lttng_action_status status; @@ -373,13 +368,13 @@ end: return status; } -enum lttng_action_status lttng_action_rotate_session_set_rate_policy( - struct lttng_action *action, - const struct lttng_rate_policy *policy) +enum lttng_action_status +lttng_action_rotate_session_set_rate_policy(struct lttng_action *action, + const struct lttng_rate_policy *policy) { enum lttng_action_status status; struct lttng_action_rotate_session *rotate_session_action; - struct lttng_rate_policy *copy = NULL; + struct lttng_rate_policy *copy = nullptr; if (!action || !policy || !IS_ROTATE_SESSION_ACTION(action)) { status = LTTNG_ACTION_STATUS_INVALID; @@ -400,16 +395,16 @@ enum lttng_action_status lttng_action_rotate_session_set_rate_policy( /* Assign the policy. */ rotate_session_action->policy = copy; status = LTTNG_ACTION_STATUS_OK; - copy = NULL; + copy = nullptr; end: lttng_rate_policy_destroy(copy); return status; } -enum lttng_action_status lttng_action_rotate_session_get_rate_policy( - const struct lttng_action *action, - const struct lttng_rate_policy **policy) +enum lttng_action_status +lttng_action_rotate_session_get_rate_policy(const struct lttng_action *action, + const struct lttng_rate_policy **policy) { enum lttng_action_status status; const struct lttng_action_rotate_session *rotate_session_action; @@ -428,8 +423,7 @@ end: } static const struct lttng_rate_policy * -lttng_action_rotate_session_internal_get_rate_policy( - const struct lttng_action *action) +lttng_action_rotate_session_internal_get_rate_policy(const struct lttng_action *action) { const struct lttng_action_rotate_session *_action; _action = action_rotate_session_from_action_const(action);