projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename action group to action list
[lttng-tools.git]
/
src
/
common
/
actions
/
group.c
diff --git
a/src/common/actions/group.c
b/src/common/actions/group.c
index 3effa871561c6fd97e03143a27a72083ffcb74a0..fd3e65fccee223efaec569759978b82565e2a15a 100644
(file)
--- a/
src/common/actions/group.c
+++ b/
src/common/actions/group.c
@@
-18,14
+18,14
@@
#define IS_GROUP_ACTION(action) \
(lttng_action_get_type(action) == LTTNG_ACTION_TYPE_GROUP)
#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 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;
/*
uint32_t action_count;
/*
@@
-34,45
+34,45
@@
struct lttng_action_group_comm {
char data[];
} LTTNG_PACKED;
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);
}
{
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);
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);
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;
{
unsigned int i, count;
- struct lttng_action_
group *action_group
;
+ struct lttng_action_
list *action_list
;
bool valid;
assert(IS_GROUP_ACTION(action));
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(
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);
assert(child);
@@
-88,19
+88,19
@@
end:
return valid;
}
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;
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;
}
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;
}
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 =
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 =
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);
assert(child_a);
assert(child_b);
@@
-128,11
+128,11
@@
end:
return is_equal;
}
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 *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;
int ret;
unsigned int i, count;
@@
-140,11
+140,11
@@
static int lttng_action_group_serialize(
assert(payload);
assert(IS_GROUP_ACTION(action));
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;
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(
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);
assert(child);
@@
-174,34
+174,34
@@
end:
return ret;
}
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;
}
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;
}
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;
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;
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;
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;
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;
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;
}
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;
}
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;
lttng_action_put(child_action);
child_action = NULL;
@@
-246,27
+246,27
@@
ssize_t lttng_action_group_create_from_payload(
group = NULL;
end:
group = NULL;
end:
- lttng_action_
group
_destroy(group);
+ lttng_action_
list
_destroy(group);
return consumed_len;
}
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 *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);
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 =
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);
action_status = lttng_action_add_error_query_results(
inner_action, results);
@@
-278,37
+278,37
@@
end:
return action_status;
}
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;
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 = NULL;
goto end;
}
- action = &action_
group
->parent;
+ action = &action_
list
->parent;
lttng_action_init(action, LTTNG_ACTION_TYPE_GROUP,
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,
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;
}
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, struct lttng_action *action)
{
- struct lttng_action_
group *action_group
;
+ struct lttng_action_
list *action_list
;
enum lttng_action_status status;
int ret;
enum lttng_action_status status;
int ret;
@@
-326,9
+326,9
@@
enum lttng_action_status lttng_action_group_add_action(
goto end;
}
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;
action);
if (ret < 0) {
status = LTTNG_ACTION_STATUS_ERROR;
@@
-342,10
+342,10
@@
end:
return status;
}
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, 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)) {
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;
}
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;
}
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)
{
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
}
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, 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;
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;
}
LTTNG_ACTION_STATUS_OK) {
goto end;
}
@@
-383,8
+383,8
@@
struct lttng_action *lttng_action_group_borrow_mutable_at_index(
goto end;
}
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;
index);
end:
return action;
This page took
0.031426 seconds
and
4
git commands to generate.