X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Fsnapshot-session.c;h=7c5775eb8da724d298c3b14799e4bd8dc2fbeac9;hp=9e8e43577492b3f4d5bd0f3610fb529d7c37299a;hb=d35c7a3876fe55d0b6595c72e83e33d9f24e22c1;hpb=757c48a28258e64fe251b6803ccdba7898590d70 diff --git a/src/common/actions/snapshot-session.c b/src/common/actions/snapshot-session.c index 9e8e43577..7c5775eb8 100644 --- a/src/common/actions/snapshot-session.c +++ b/src/common/actions/snapshot-session.c @@ -8,18 +8,20 @@ #include #include #include +#include +#include #include -#include -#include +#include #include +#include +#include #include #include -#include #include -#include +#include #define IS_SNAPSHOT_SESSION_ACTION(action) \ - (lttng_action_get_type_const(action) == LTTNG_ACTION_TYPE_SNAPSHOT_SESSION) + (lttng_action_get_type(action) == LTTNG_ACTION_TYPE_SNAPSHOT_SESSION) struct lttng_action_snapshot_session { struct lttng_action parent; @@ -34,19 +36,21 @@ struct lttng_action_snapshot_session { * Owned by this. */ struct lttng_snapshot_output *output; + struct lttng_firing_policy *policy; }; struct lttng_action_snapshot_session_comm { /* All string lengths include the trailing \0. */ uint32_t session_name_len; uint32_t snapshot_output_len; + uint32_t firing_policy_len; /* * Variable data (all strings are null-terminated): * * - session name string * - snapshot output object - * + * - policy object */ char data[]; } LTTNG_PACKED; @@ -119,21 +123,14 @@ static bool lttng_action_snapshot_session_is_equal( goto end; } - is_equal = true; + is_equal = lttng_firing_policy_is_equal(a->policy, b->policy); end: return is_equal; } -static size_t serialize_strlen(const char *s) +static size_t serialize_strlen(const char *str) { - - size_t len = 0; - - if (s) { - len = strlen(s) + 1; - } - - return len; + return str ? strlen(str) + 1 : 0; } static int lttng_action_snapshot_session_serialize( @@ -148,7 +145,6 @@ static int lttng_action_snapshot_session_serialize( assert(payload); size_before_comm = payload->buffer.size; - size_before_comm = size_before_comm + sizeof(comm); action_snapshot_session = action_snapshot_session_from_action(action); comm.session_name_len = @@ -185,13 +181,32 @@ static int lttng_action_snapshot_session_serialize( goto end; } - /* Adjust action length in header. */ comm_in_payload = (typeof(comm_in_payload))( payload->buffer.data + size_before_comm); + /* Adjust action length in header. */ comm_in_payload->snapshot_output_len = payload->buffer.size - size_before_output; } + /* Serialize the firing policy. */ + { + const size_t size_before_output = payload->buffer.size; + struct lttng_action_snapshot_session_comm *comm_in_payload; + + ret = lttng_firing_policy_serialize( + action_snapshot_session->policy, payload); + if (ret) { + ret = -1; + goto end; + } + + comm_in_payload = (typeof(comm_in_payload))( + payload->buffer.data + size_before_comm); + /* Adjust firing policy length in header. */ + comm_in_payload->firing_policy_len = + payload->buffer.size - size_before_output; + } + end: return ret; } @@ -208,6 +223,7 @@ static void lttng_action_snapshot_session_destroy(struct lttng_action *action) free(action_snapshot_session->session_name); lttng_snapshot_output_destroy(action_snapshot_session->output); + lttng_firing_policy_destroy(action_snapshot_session->policy); free(action_snapshot_session); end: @@ -219,18 +235,27 @@ ssize_t lttng_action_snapshot_session_create_from_payload( struct lttng_action **p_action) { ssize_t consumed_len; - const struct lttng_action_snapshot_session_comm *comm; const char *variable_data; struct lttng_action *action; enum lttng_action_status status; struct lttng_snapshot_output *snapshot_output = NULL; + struct lttng_firing_policy *policy = NULL; + const struct lttng_action_snapshot_session_comm *comm; + const struct lttng_payload_view snapshot_session_comm_view = + lttng_payload_view_from_view( + view, 0, sizeof(*comm)); action = lttng_action_snapshot_session_create(); if (!action) { goto error; } - comm = (typeof(comm)) view->buffer.data; + if (!lttng_payload_view_is_valid(&snapshot_session_comm_view)) { + /* Payload not large enough to contain the header. */ + goto error; + } + + comm = (typeof(comm)) snapshot_session_comm_view.buffer.data; variable_data = (const char *) &comm->data; consumed_len = sizeof(struct lttng_action_snapshot_session_comm); @@ -257,8 +282,8 @@ ssize_t lttng_action_snapshot_session_create_from_payload( lttng_payload_view_from_view(view, consumed_len, comm->snapshot_output_len); - if (!snapshot_output_buffer_view.buffer.data) { - fprintf(stderr, "Failed to create buffer view for snapshot output.\n"); + if (!lttng_payload_view_is_valid(&snapshot_output_buffer_view)) { + ERR("Failed to create buffer view for snapshot output."); goto error; } @@ -267,8 +292,7 @@ ssize_t lttng_action_snapshot_session_create_from_payload( &snapshot_output_buffer_view, &snapshot_output); if (snapshot_output_consumed_len != comm->snapshot_output_len) { - fprintf(stderr, - "Failed to deserialize snapshot output object: " + ERR("Failed to deserialize snapshot output object: " "consumed-len: %zd, expected-len: %" PRIu32, snapshot_output_consumed_len, comm->snapshot_output_len); @@ -287,6 +311,48 @@ ssize_t lttng_action_snapshot_session_create_from_payload( variable_data += comm->snapshot_output_len; consumed_len += comm->snapshot_output_len; + + /* Firing policy. */ + if (comm->firing_policy_len <= 0) { + ERR("Firing policy should be present."); + goto error; + } + { + ssize_t firing_policy_consumed_len; + struct lttng_payload_view policy_view = + lttng_payload_view_from_view(view, consumed_len, + comm->firing_policy_len); + + if (!lttng_payload_view_is_valid(&policy_view)) { + ERR("Failed to create buffer view for firing policy."); + goto error; + } + + firing_policy_consumed_len = + lttng_firing_policy_create_from_payload( + &policy_view, &policy); + if (firing_policy_consumed_len < 0) { + goto error; + } + + if (firing_policy_consumed_len != comm->firing_policy_len) { + ERR("Failed to deserialize firing policy object: " + "consumed-len: %zd, expected-len: %" PRIu32, + firing_policy_consumed_len, + comm->firing_policy_len); + goto error; + } + + status = lttng_action_snapshot_session_set_firing_policy( + action, policy); + if (status != LTTNG_ACTION_STATUS_OK) { + goto error; + } + } + + variable_data += comm->firing_policy_len; + consumed_len += comm->firing_policy_len; + *p_action = action; action = NULL; @@ -296,6 +362,7 @@ error: consumed_len = -1; end: + lttng_firing_policy_destroy(policy); lttng_action_snapshot_session_destroy(action); lttng_snapshot_output_destroy(snapshot_output); @@ -304,7 +371,15 @@ end: struct lttng_action *lttng_action_snapshot_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_snapshot_session)); if (!action) { @@ -317,7 +392,16 @@ struct lttng_action *lttng_action_snapshot_session_create(void) lttng_action_snapshot_session_is_equal, lttng_action_snapshot_session_destroy); + status = lttng_action_snapshot_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; } @@ -420,3 +504,58 @@ enum lttng_action_status lttng_action_snapshot_session_get_output( end: return status; } + +enum lttng_action_status lttng_action_snapshot_session_set_firing_policy( + struct lttng_action *action, + const struct lttng_firing_policy *policy) +{ + enum lttng_action_status status; + struct lttng_action_snapshot_session *snapshot_session_action; + struct lttng_firing_policy *copy = NULL; + + if (!action || !policy || !IS_SNAPSHOT_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; + } + + snapshot_session_action = action_snapshot_session_from_action(action); + + /* Free the previous firing policy .*/ + lttng_firing_policy_destroy(snapshot_session_action->policy); + + /* Assign the policy. */ + snapshot_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_snapshot_session_get_firing_policy( + const struct lttng_action *action, + const struct lttng_firing_policy **policy) +{ + enum lttng_action_status status; + const struct lttng_action_snapshot_session *snapshot_session_action; + + if (!action || !policy || !IS_SNAPSHOT_SESSION_ACTION(action)) { + status = LTTNG_ACTION_STATUS_INVALID; + goto end; + } + + snapshot_session_action = + action_snapshot_session_from_action_const(action); + + *policy = snapshot_session_action->policy; + status = LTTNG_ACTION_STATUS_OK; +end: + return status; +}