Rename action group to action list
[lttng-tools.git] / src / common / actions / group.c
index 3effa871561c6fd97e03143a27a72083ffcb74a0..fd3e65fccee223efaec569759978b82565e2a15a 100644 (file)
 #define IS_GROUP_ACTION(action) \
        (lttng_action_get_type(action) == LTTNG_ACTION_TYPE_GROUP)
 
-struct lttng_action_group {
+struct lttng_action_list {
        struct lttng_action parent;
 
        /* The array owns the action elements. */
        struct lttng_dynamic_pointer_array actions;
 };
 
-struct lttng_action_group_comm {
+struct lttng_action_list_comm {
        uint32_t action_count;
 
        /*
@@ -34,45 +34,45 @@ struct lttng_action_group_comm {
        char data[];
 } LTTNG_PACKED;
 
-static void destroy_lttng_action_group_element(void *ptr)
+static void destroy_lttng_action_list_element(void *ptr)
 {
        struct lttng_action *element = (struct lttng_action *) ptr;
 
        lttng_action_destroy(element);
 }
 
-static struct lttng_action_group *action_group_from_action(
+static struct lttng_action_list *action_list_from_action(
                const struct lttng_action *action)
 {
        assert(action);
 
-       return container_of(action, struct lttng_action_group, parent);
+       return container_of(action, struct lttng_action_list, parent);
 }
 
-static const struct lttng_action_group *action_group_from_action_const(
+static const struct lttng_action_list *action_list_from_action_const(
                const struct lttng_action *action)
 {
        assert(action);
 
-       return container_of(action, struct lttng_action_group, parent);
+       return container_of(action, struct lttng_action_list, parent);
 }
 
-static bool lttng_action_group_validate(struct lttng_action *action)
+static bool lttng_action_list_validate(struct lttng_action *action)
 {
        unsigned int i, count;
-       struct lttng_action_group *action_group;
+       struct lttng_action_list *action_list;
        bool valid;
 
        assert(IS_GROUP_ACTION(action));
 
-       action_group = action_group_from_action(action);
+       action_list = action_list_from_action(action);
 
-       count = lttng_dynamic_pointer_array_get_count(&action_group->actions);
+       count = lttng_dynamic_pointer_array_get_count(&action_list->actions);
 
        for (i = 0; i < count; i++) {
                struct lttng_action *child =
                                lttng_dynamic_pointer_array_get_pointer(
-                                               &action_group->actions, i);
+                                               &action_list->actions, i);
 
                assert(child);
 
@@ -88,19 +88,19 @@ end:
        return valid;
 }
 
-static bool lttng_action_group_is_equal(
+static bool lttng_action_list_is_equal(
                const struct lttng_action *_a, const struct lttng_action *_b)
 {
        bool is_equal = false;
        unsigned int i;
        unsigned int a_count, b_count;
 
-       if (lttng_action_group_get_count(_a, &a_count) !=
+       if (lttng_action_list_get_count(_a, &a_count) !=
                        LTTNG_ACTION_STATUS_OK) {
                goto end;
        }
 
-       if (lttng_action_group_get_count(_b, &b_count) !=
+       if (lttng_action_list_get_count(_b, &b_count) !=
                        LTTNG_ACTION_STATUS_OK) {
                goto end;
        }
@@ -111,9 +111,9 @@ static bool lttng_action_group_is_equal(
 
        for (i = 0; i < a_count; i++) {
                const struct lttng_action *child_a =
-                       lttng_action_group_get_at_index(_a, i);
+                       lttng_action_list_get_at_index(_a, i);
                const struct lttng_action *child_b =
-                       lttng_action_group_get_at_index(_b, i);
+                       lttng_action_list_get_at_index(_b, i);
 
                assert(child_a);
                assert(child_b);
@@ -128,11 +128,11 @@ end:
        return is_equal;
 }
 
-static int lttng_action_group_serialize(
+static int lttng_action_list_serialize(
                struct lttng_action *action, struct lttng_payload *payload)
 {
-       struct lttng_action_group *action_group;
-       struct lttng_action_group_comm comm;
+       struct lttng_action_list *action_list;
+       struct lttng_action_list_comm comm;
        int ret;
        unsigned int i, count;
 
@@ -140,11 +140,11 @@ static int lttng_action_group_serialize(
        assert(payload);
        assert(IS_GROUP_ACTION(action));
 
-       action_group = action_group_from_action(action);
+       action_list = action_list_from_action(action);
 
-       DBG("Serializing action group");
+       DBG("Serializing action list");
 
-       count = lttng_dynamic_pointer_array_get_count(&action_group->actions);
+       count = lttng_dynamic_pointer_array_get_count(&action_list->actions);
 
        comm.action_count = count;
 
@@ -158,7 +158,7 @@ static int lttng_action_group_serialize(
        for (i = 0; i < count; i++) {
                struct lttng_action *child =
                                lttng_dynamic_pointer_array_get_pointer(
-                                               &action_group->actions, i);
+                                               &action_list->actions, i);
 
                assert(child);
 
@@ -174,34 +174,34 @@ end:
        return ret;
 }
 
-static void lttng_action_group_destroy(struct lttng_action *action)
+static void lttng_action_list_destroy(struct lttng_action *action)
 {
-       struct lttng_action_group *action_group;
+       struct lttng_action_list *action_list;
 
        if (!action) {
                goto end;
        }
 
-       action_group = action_group_from_action(action);
-       lttng_dynamic_pointer_array_reset(&action_group->actions);
-       free(action_group);
+       action_list = action_list_from_action(action);
+       lttng_dynamic_pointer_array_reset(&action_list->actions);
+       free(action_list);
 
 end:
        return;
 }
 
-ssize_t lttng_action_group_create_from_payload(
+ssize_t lttng_action_list_create_from_payload(
                struct lttng_payload_view *view,
                struct lttng_action **p_action)
 {
        ssize_t consumed_len;
-       const struct lttng_action_group_comm *comm;
+       const struct lttng_action_list_comm *comm;
        struct lttng_action *group;
        struct lttng_action *child_action = NULL;
        enum lttng_action_status status;
        size_t i;
 
-       group = lttng_action_group_create();
+       group = lttng_action_list_create();
        if (!group) {
                consumed_len = -1;
                goto end;
@@ -209,7 +209,7 @@ ssize_t lttng_action_group_create_from_payload(
 
        comm = (typeof(comm)) view->buffer.data;
 
-       consumed_len = sizeof(struct lttng_action_group_comm);
+       consumed_len = sizeof(struct lttng_action_list_comm);
 
        for (i = 0; i < comm->action_count; i++) {
                ssize_t consumed_len_child;
@@ -229,13 +229,13 @@ ssize_t lttng_action_group_create_from_payload(
                        goto end;
                }
 
-               status = lttng_action_group_add_action(group, child_action);
+               status = lttng_action_list_add_action(group, child_action);
                if (status != LTTNG_ACTION_STATUS_OK) {
                        consumed_len = -1;
                        goto end;
                }
 
-               /* Transfer ownership to the action group. */
+               /* Transfer ownership to the action list. */
                lttng_action_put(child_action);
                child_action = NULL;
 
@@ -246,27 +246,27 @@ ssize_t lttng_action_group_create_from_payload(
        group = NULL;
 
 end:
-       lttng_action_group_destroy(group);
+       lttng_action_list_destroy(group);
        return consumed_len;
 }
 
-static enum lttng_action_status lttng_action_group_add_error_query_results(
+static enum lttng_action_status lttng_action_list_add_error_query_results(
                const struct lttng_action *action,
                struct lttng_error_query_results *results)
 {
        unsigned int i, count;
        enum lttng_action_status action_status;
-       const struct lttng_action_group *group =
+       const struct lttng_action_list *group =
                        container_of(action, typeof(*group), parent);
 
-       action_status = lttng_action_group_get_count(action, &count);
+       action_status = lttng_action_list_get_count(action, &count);
        if (action_status != LTTNG_ACTION_STATUS_OK) {
                goto end;
        }
 
        for (i = 0; i < count; i++) {
                struct lttng_action *inner_action =
-                               lttng_action_group_borrow_mutable_at_index(action, i);
+                               lttng_action_list_borrow_mutable_at_index(action, i);
 
                action_status = lttng_action_add_error_query_results(
                                inner_action, results);
@@ -278,37 +278,37 @@ end:
        return action_status;
 }
 
-struct lttng_action *lttng_action_group_create(void)
+struct lttng_action *lttng_action_list_create(void)
 {
-       struct lttng_action_group *action_group;
+       struct lttng_action_list *action_list;
        struct lttng_action *action;
 
-       action_group = zmalloc(sizeof(struct lttng_action_group));
-       if (!action_group) {
+       action_list = zmalloc(sizeof(struct lttng_action_list));
+       if (!action_list) {
                action = NULL;
                goto end;
        }
 
-       action = &action_group->parent;
+       action = &action_list->parent;
 
        lttng_action_init(action, LTTNG_ACTION_TYPE_GROUP,
-                       lttng_action_group_validate,
-                       lttng_action_group_serialize,
-                       lttng_action_group_is_equal, lttng_action_group_destroy,
+                       lttng_action_list_validate,
+                       lttng_action_list_serialize,
+                       lttng_action_list_is_equal, lttng_action_list_destroy,
                        NULL,
-                       lttng_action_group_add_error_query_results);
+                       lttng_action_list_add_error_query_results);
 
-       lttng_dynamic_pointer_array_init(&action_group->actions,
-                       destroy_lttng_action_group_element);
+       lttng_dynamic_pointer_array_init(&action_list->actions,
+                       destroy_lttng_action_list_element);
 
 end:
        return action;
 }
 
-enum lttng_action_status lttng_action_group_add_action(
+enum lttng_action_status lttng_action_list_add_action(
                struct lttng_action *group, struct lttng_action *action)
 {
-       struct lttng_action_group *action_group;
+       struct lttng_action_list *action_list;
        enum lttng_action_status status;
        int ret;
 
@@ -326,9 +326,9 @@ enum lttng_action_status lttng_action_group_add_action(
                goto end;
        }
 
-       action_group = action_group_from_action(group);
+       action_list = action_list_from_action(group);
 
-       ret = lttng_dynamic_pointer_array_add_pointer(&action_group->actions,
+       ret = lttng_dynamic_pointer_array_add_pointer(&action_list->actions,
                        action);
        if (ret < 0) {
                status = LTTNG_ACTION_STATUS_ERROR;
@@ -342,10 +342,10 @@ end:
        return status;
 }
 
-enum lttng_action_status lttng_action_group_get_count(
+enum lttng_action_status lttng_action_list_get_count(
                const struct lttng_action *group, unsigned int *count)
 {
-       const struct lttng_action_group *action_group;
+       const struct lttng_action_list *action_list;
        enum lttng_action_status status = LTTNG_ACTION_STATUS_OK;
 
        if (!group || !IS_GROUP_ACTION(group)) {
@@ -354,27 +354,27 @@ enum lttng_action_status lttng_action_group_get_count(
                goto end;
        }
 
-       action_group = action_group_from_action_const(group);
-       *count = lttng_dynamic_pointer_array_get_count(&action_group->actions);
+       action_list = action_list_from_action_const(group);
+       *count = lttng_dynamic_pointer_array_get_count(&action_list->actions);
 end:
        return status;
 }
 
-const struct lttng_action *lttng_action_group_get_at_index(
+const struct lttng_action *lttng_action_list_get_at_index(
                const struct lttng_action *group, unsigned int index)
 {
-       return lttng_action_group_borrow_mutable_at_index(group, index);
+       return lttng_action_list_borrow_mutable_at_index(group, index);
 }
 
 LTTNG_HIDDEN
-struct lttng_action *lttng_action_group_borrow_mutable_at_index(
+struct lttng_action *lttng_action_list_borrow_mutable_at_index(
                const struct lttng_action *group, unsigned int index)
 {
        unsigned int count;
-       const struct lttng_action_group *action_group;
+       const struct lttng_action_list *action_list;
        struct lttng_action *action = NULL;
 
-       if (lttng_action_group_get_count(group, &count) !=
+       if (lttng_action_list_get_count(group, &count) !=
                        LTTNG_ACTION_STATUS_OK) {
                goto end;
        }
@@ -383,8 +383,8 @@ struct lttng_action *lttng_action_group_borrow_mutable_at_index(
                goto end;
        }
 
-       action_group = action_group_from_action_const(group);
-       action = lttng_dynamic_pointer_array_get_pointer(&action_group->actions,
+       action_list = action_list_from_action_const(group);
+       action = lttng_dynamic_pointer_array_get_pointer(&action_list->actions,
                        index);
 end:
        return action;
This page took 0.0292 seconds and 4 git commands to generate.