* The actions to be executed with their respective execution context.
* See struct `action_work_subitem`.
*/
- struct lttng_dynamic_array *subitems;
+ struct lttng_dynamic_array subitems;
/* Execution context data */
struct lttng_trigger *trigger;
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 */
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();
}
DBG("Starting execution of action work item %" PRIu64 " of trigger `%s`",
work_item->id, get_trigger_name(work_item->trigger));
- count = lttng_dynamic_array_get_count(work_item->subitems);
+ count = lttng_dynamic_array_get_count(&work_item->subitems);
for (i = 0; i < count; i++) {
struct action_work_subitem *item;
- item = lttng_dynamic_array_get_element(work_item->subitems, i);
+ item = lttng_dynamic_array_get_element(&work_item->subitems, i);
ret = action_executor_generic_handler(
executor, work_item, item);
if (ret) {
lttng_trigger_put(work_item->trigger);
lttng_evaluation_destroy(work_item->evaluation);
notification_client_list_put(work_item->client_list);
- lttng_dynamic_array_reset(work_item->subitems);
+ lttng_dynamic_array_reset(&work_item->subitems);
free(work_item);
}
DBG("Entering work execution loop");
pthread_mutex_lock(&executor->work.lock);
while (!executor->should_quit) {
- int ret;
+ int ret = 0;
struct action_work_item *work_item;
health_code_update();
const uint64_t work_item_id = executor->next_work_item_id++;
struct action_work_item *work_item;
bool signal = false;
- struct lttng_dynamic_array *subitems = NULL;
assert(trigger);
- /* Build the array of action work subitems for the passed trigger. */
- subitems = zmalloc(sizeof(*subitems));
- if (!subitems) {
- PERROR("Failed to allocate action executor subitems array: trigger name = `%s`",
- get_trigger_name(trigger));
- executor_status = ACTION_EXECUTOR_STATUS_ERROR;
- goto error_unlock;
- }
-
- lttng_dynamic_array_init(subitems, sizeof(struct action_work_subitem),
- action_work_subitem_destructor);
-
- ret = populate_subitem_array_from_trigger(trigger, subitems);
- if (ret) {
- ERR("Failed to populate work item sub items on behalf of trigger: trigger name = `%s`",
- get_trigger_name(trigger));
- executor_status = ACTION_EXECUTOR_STATUS_ERROR;
- goto error_unlock;
- }
-
pthread_mutex_lock(&executor->work.lock);
/* Check for queue overflow. */
if (executor->work.pending_count >= MAX_QUEUED_WORK_COUNT) {
*work_item = (typeof(*work_item)){
.id = work_item_id,
- /* Ownership transferred to the work item. */
- .subitems = subitems,
.trigger = trigger,
/* Ownership transferred to the work item. */
.evaluation = evaluation,
};
evaluation = NULL;
- subitems = NULL;
+
+ /* Build the array of action work subitems for the passed trigger. */
+ lttng_dynamic_array_init(&work_item->subitems,
+ sizeof(struct action_work_subitem),
+ action_work_subitem_destructor);
+
+ ret = populate_subitem_array_from_trigger(
+ trigger, &work_item->subitems);
+ if (ret) {
+ ERR("Failed to populate work item sub items on behalf of trigger: trigger name = `%s`",
+ get_trigger_name(trigger));
+ executor_status = ACTION_EXECUTOR_STATUS_ERROR;
+ goto error_unlock;
+ }
+
cds_list_add_tail(&work_item->list_node, &executor->work.list);
executor->work.pending_count++;
DBG("Enqueued action for trigger: trigger name = `%s`, work item id = %" PRIu64,
if (signal) {
pthread_cond_signal(&executor->work.cond);
}
- pthread_mutex_unlock(&executor->work.lock);
+ pthread_mutex_unlock(&executor->work.lock);
lttng_evaluation_destroy(evaluation);
- if (subitems) {
- lttng_dynamic_array_reset(subitems);
- free(subitems);
- }
return executor_status;
}
static int add_action_to_subitem_array(struct lttng_action *action,
struct lttng_dynamic_array *subitems)
{
- int ret;
+ int ret = 0;
enum lttng_action_type type = lttng_action_get_type(action);
const char *session_name = NULL;
enum lttng_action_status status;
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:
* simplicity and consistency.
*/
if (session_name != NULL) {
- struct ltt_session *session = NULL;
+ uint64_t session_id;
- session_lock_list();
- session = session_find_by_name(session_name);
- if (session) {
+ /*
+ * Instantaneous sampling of the session id if present.
+ *
+ * This method is preferred over `sessiond_find_by_name` then
+ * fetching the session'd id since `sessiond_find_by_name`
+ * requires the session list lock to be taken.
+ *
+ * Taking the session list lock can lead to a deadlock
+ * between the action executor and the notification thread
+ * (caller of add_action_to_subitem_array). It is okay if the
+ * session state changes between the enqueuing time and the
+ * execution time. The execution context is validated at
+ * execution time.
+ */
+ if (sample_session_id_by_name(session_name, &session_id)) {
LTTNG_OPTIONAL_SET(&subitem.context.session_id,
- session->id);
- session_put(session);
+ session_id);
}
-
- session_unlock_list();
}
/* Get a reference to the action. */
projects / lttng-tools.git / blobdiff