X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Faction.c;h=86628542bc50186c32b20a0bc026530a235672d6;hp=208858e2671c6d94210b9dd81cccbae57a1dd56a;hb=2463b7879c00298daa79744cdaae82ac061a4ed8;hpb=931bdbaa3a3fd1d586a0045c15cac23d6cfc67f9 diff --git a/src/common/actions/action.c b/src/common/actions/action.c index 208858e26..86628542b 100644 --- a/src/common/actions/action.c +++ b/src/common/actions/action.c @@ -8,17 +8,27 @@ #include #include #include +#include #include +#include +#include #include #include -static const char *lttng_action_type_string(enum lttng_action_type action_type) +LTTNG_HIDDEN +const char *lttng_action_type_string(enum lttng_action_type action_type) { switch (action_type) { case LTTNG_ACTION_TYPE_UNKNOWN: return "UNKNOWN"; + case LTTNG_ACTION_TYPE_GROUP: + return "GROUP"; case LTTNG_ACTION_TYPE_NOTIFY: return "NOTIFY"; + case LTTNG_ACTION_TYPE_ROTATE_SESSION: + return "ROTATE_SESSION"; + case LTTNG_ACTION_TYPE_SNAPSHOT_SESSION: + return "SNAPSHOT_SESSION"; case LTTNG_ACTION_TYPE_START_SESSION: return "START_SESSION"; case LTTNG_ACTION_TYPE_STOP_SESSION: @@ -28,18 +38,11 @@ static const char *lttng_action_type_string(enum lttng_action_type action_type) } } -enum lttng_action_type lttng_action_get_type(struct lttng_action *action) +enum lttng_action_type lttng_action_get_type(const struct lttng_action *action) { return action ? action->type : LTTNG_ACTION_TYPE_UNKNOWN; } -LTTNG_HIDDEN -enum lttng_action_type lttng_action_get_type_const( - const struct lttng_action *action) -{ - return action->type; -} - LTTNG_HIDDEN void lttng_action_init( struct lttng_action *action, @@ -49,6 +52,7 @@ void lttng_action_init( action_equal_cb equal, action_destroy_cb destroy) { + urcu_ref_init(&action->ref); action->type = type; action->validate = validate; action->serialize = serialize; @@ -56,14 +60,35 @@ void lttng_action_init( action->destroy = destroy; } -void lttng_action_destroy(struct lttng_action *action) +static +void action_destroy_ref(struct urcu_ref *ref) +{ + struct lttng_action *action = + container_of(ref, struct lttng_action, ref); + + action->destroy(action); +} + +LTTNG_HIDDEN +void lttng_action_get(struct lttng_action *action) +{ + urcu_ref_get(&action->ref); +} + +LTTNG_HIDDEN +void lttng_action_put(struct lttng_action *action) { if (!action) { return; } assert(action->destroy); - action->destroy(action); + urcu_ref_put(&action->ref, action_destroy_ref); +} + +void lttng_action_destroy(struct lttng_action *action) +{ + lttng_action_put(action); } LTTNG_HIDDEN @@ -89,20 +114,20 @@ end: LTTNG_HIDDEN int lttng_action_serialize(struct lttng_action *action, - struct lttng_dynamic_buffer *buf) + struct lttng_payload *payload) { int ret; struct lttng_action_comm action_comm = { .action_type = (int8_t) action->type, }; - ret = lttng_dynamic_buffer_append(buf, &action_comm, + ret = lttng_dynamic_buffer_append(&payload->buffer, &action_comm, sizeof(action_comm)); if (ret) { goto end; } - ret = action->serialize(action, buf); + ret = action->serialize(action, payload); if (ret) { goto end; } @@ -111,38 +136,48 @@ end: } LTTNG_HIDDEN -ssize_t lttng_action_create_from_buffer(const struct lttng_buffer_view *view, +ssize_t lttng_action_create_from_payload(struct lttng_payload_view *view, struct lttng_action **action) { ssize_t consumed_len, specific_action_consumed_len; const struct lttng_action_comm *action_comm; - action_create_from_buffer_cb create_from_buffer_cb; - struct lttng_buffer_view specific_action_view; + action_create_from_payload_cb create_from_payload_cb; if (!view || !action) { consumed_len = -1; goto end; } - action_comm = (const struct lttng_action_comm *) view->data; + action_comm = (const struct lttng_action_comm *) view->buffer.data; - DBG("Create action from buffer: action-type=%s", + DBG("Create action from payload: action-type=%s", lttng_action_type_string(action_comm->action_type)); switch (action_comm->action_type) { case LTTNG_ACTION_TYPE_NOTIFY: - create_from_buffer_cb = lttng_action_notify_create_from_buffer; + create_from_payload_cb = lttng_action_notify_create_from_payload; + break; + case LTTNG_ACTION_TYPE_ROTATE_SESSION: + create_from_payload_cb = + lttng_action_rotate_session_create_from_payload; + break; + case LTTNG_ACTION_TYPE_SNAPSHOT_SESSION: + create_from_payload_cb = + lttng_action_snapshot_session_create_from_payload; break; case LTTNG_ACTION_TYPE_START_SESSION: - create_from_buffer_cb = - lttng_action_start_session_create_from_buffer; + create_from_payload_cb = + lttng_action_start_session_create_from_payload; break; case LTTNG_ACTION_TYPE_STOP_SESSION: - create_from_buffer_cb = - lttng_action_stop_session_create_from_buffer; + create_from_payload_cb = + lttng_action_stop_session_create_from_payload; + break; + case LTTNG_ACTION_TYPE_GROUP: + create_from_payload_cb = lttng_action_group_create_from_payload; break; default: - ERR("Failed to create action from buffer, unhandled action type: action-type=%u (%s)", + ERR("Failed to create action from payload, unhandled action type: action-type=%u (%s)", action_comm->action_type, lttng_action_type_string( action_comm->action_type)); @@ -150,13 +185,16 @@ ssize_t lttng_action_create_from_buffer(const struct lttng_buffer_view *view, goto end; } - /* Create buffer view for the action-type-specific data. */ - specific_action_view = lttng_buffer_view_from_view(view, - sizeof(struct lttng_action_comm), - view->size - sizeof(struct lttng_action_comm)); + { + /* Create buffer view for the action-type-specific data. */ + struct lttng_payload_view specific_action_view = + lttng_payload_view_from_view(view, + sizeof(struct lttng_action_comm), + -1); - specific_action_consumed_len = - create_from_buffer_cb(&specific_action_view, action); + specific_action_consumed_len = create_from_payload_cb( + &specific_action_view, action); + } if (specific_action_consumed_len < 0) { ERR("Failed to create specific action from buffer."); consumed_len = -1;