struct action_executor *executor,
const struct action_work_item *,
struct action_work_subitem *);
-static int action_executor_group_handler(struct action_executor *executor,
+static int action_executor_list_handler(struct action_executor *executor,
const struct action_work_item *,
struct action_work_subitem *);
static int action_executor_generic_handler(struct action_executor *executor,
[LTTNG_ACTION_TYPE_STOP_SESSION] = action_executor_stop_session_handler,
[LTTNG_ACTION_TYPE_ROTATE_SESSION] = action_executor_rotate_session_handler,
[LTTNG_ACTION_TYPE_SNAPSHOT_SESSION] = action_executor_snapshot_session_handler,
- [LTTNG_ACTION_TYPE_GROUP] = action_executor_group_handler,
+ [LTTNG_ACTION_TYPE_LIST] = action_executor_list_handler,
};
/* Forward declaration */
enum lttng_trigger_status trigger_status;
trigger_status = lttng_trigger_get_name(trigger, &trigger_name);
- assert(trigger_status == LTTNG_TRIGGER_STATUS_OK);
+ switch (trigger_status) {
+ case LTTNG_TRIGGER_STATUS_OK:
+ break;
+ case LTTNG_TRIGGER_STATUS_UNSET:
+ trigger_name = "(anonymous)";
+ break;
+ default:
+ trigger_name = "(failed to get name)";
+ break;
+ }
return trigger_name;
}
return ret;
}
-static int action_executor_group_handler(struct action_executor *executor,
+static int action_executor_list_handler(struct action_executor *executor,
const struct action_work_item *work_item,
struct action_work_subitem *item)
{
- ERR("Execution of a group action by the action executor should never occur");
+ ERR("Execution of a list action by the action executor should never occur");
abort();
}
uid_t trigger_owner_uid;
enum lttng_trigger_status trigger_status;
- trigger_status = lttng_trigger_get_name(
- work_item->trigger, &trigger_name);
- switch (trigger_status) {
- case LTTNG_TRIGGER_STATUS_OK:
- break;
- case LTTNG_TRIGGER_STATUS_UNSET:
- trigger_name = "(unset)";
- break;
- default:
- abort();
- }
+ trigger_name = get_trigger_name(work_item->trigger);
trigger_status = lttng_trigger_get_owner_uid(
work_item->trigger, &trigger_owner_uid);
assert(action);
assert(subitems);
- if (type == LTTNG_ACTION_TYPE_GROUP) {
+ if (type == LTTNG_ACTION_TYPE_LIST) {
unsigned int count, i;
status = lttng_action_list_get_count(action, &count);
/*
* Go directly to the end since there is no need to add the
- * group action by itself to the subitems array.
+ * list action by itself to the subitems array.
*/
goto end;
}
action, &session_name);
assert(status == LTTNG_ACTION_STATUS_OK);
break;
- case LTTNG_ACTION_TYPE_GROUP:
+ case LTTNG_ACTION_TYPE_LIST:
case LTTNG_ACTION_TYPE_UNKNOWN:
/* Fallthrough */
default: