X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Faction-executor.cpp;h=cc481e5b74fad316b6354306b9f7c3f5fe743545;hb=6f729565b0b93009bc1e91a05bae6b7e04c1e8a1;hp=8c2374535195cc0cc59531a4d02133b3930c5e56;hpb=635e0160bfe2f0ef440ae4990bae7eed96454ae1;p=lttng-tools.git diff --git a/src/bin/lttng-sessiond/action-executor.cpp b/src/bin/lttng-sessiond/action-executor.cpp index 8c2374535..cc481e5b7 100644 --- a/src/bin/lttng-sessiond/action-executor.cpp +++ b/src/bin/lttng-sessiond/action-executor.cpp @@ -5,29 +5,29 @@ * */ -#include "action-executor.h" -#include "cmd.h" -#include "health-sessiond.h" -#include "lttng-sessiond.h" -#include "notification-thread-internal.h" -#include "session.h" -#include "thread.h" -#include -#include -#include -#include -#include +#include "action-executor.hpp" +#include "cmd.hpp" +#include "health-sessiond.hpp" +#include "lttng-sessiond.hpp" +#include "notification-thread-internal.hpp" +#include "session.hpp" +#include "thread.hpp" +#include +#include +#include +#include +#include #include -#include +#include #include #include #include #include #include #include -#include +#include #include -#include +#include #include #include #include @@ -264,7 +264,7 @@ end: static int action_executor_notify_handler(struct action_executor *executor, const struct action_work_item *work_item, - struct action_work_subitem *item) + struct action_work_subitem *item __attribute__((unused))) { return notification_client_list_send_evaluation(work_item->client_list, work_item->trigger, @@ -276,7 +276,7 @@ static int action_executor_notify_handler(struct action_executor *executor, } static int action_executor_start_session_handler( - struct action_executor *executor, + struct action_executor *executor __attribute__((unused)), const struct action_work_item *work_item, struct action_work_subitem *item) { @@ -301,40 +301,33 @@ static int action_executor_start_session_handler( * existed. If not skip the action altogether. */ if (!item->context.session_id.is_set) { - DBG("Session `%s` was not present at the moment the work item was enqueued for %s` action of trigger `%s`", + DBG("Session `%s` was not present at the moment the work item was enqueued for `%s` action of trigger `%s`", session_name, get_action_name(action), get_trigger_name(work_item->trigger)); lttng_action_increase_execution_failure_count(action); - ret = 0; goto end; } session_lock_list(); - session = session_find_by_name(session_name); + rcu_read_lock(); + session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id)); if (!session) { DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`", session_name, get_action_name(action), get_trigger_name(work_item->trigger)); + lttng_action_increase_execution_failure_count(action); goto error_unlock_list; } - /* - * Check if the session id is the same as when the work item was - * enqueued. - */ - if (session->id != LTTNG_OPTIONAL_GET(item->context.session_id)) { - DBG("Session id for session `%s` (id: %" PRIu64 - " is not the same that was sampled (id: %" PRIu64 - " at the moment the work item was enqueued for %s` action of trigger `%s`", - session_name, session->id, - LTTNG_OPTIONAL_GET(item->context.session_id), + session_lock(session); + if (session->destroyed) { + DBG("Session `%s` with id = %" PRIu64 " is flagged as destroyed. Skipping: action = `%s`, trigger = `%s`", + session->name, session->id, get_action_name(action), get_trigger_name(work_item->trigger)); - ret = 0; - goto error_put_session; + goto error_unlock_session; } - session_lock(session); if (!is_trigger_allowed_for_session(work_item->trigger, session)) { goto error_unlock_session; } @@ -359,16 +352,16 @@ static int action_executor_start_session_handler( error_unlock_session: session_unlock(session); -error_put_session: session_put(session); error_unlock_list: + rcu_read_unlock(); session_unlock_list(); end: return ret; } static int action_executor_stop_session_handler( - struct action_executor *executor, + struct action_executor *executor __attribute__((unused)), const struct action_work_item *work_item, struct action_work_subitem *item) { @@ -393,16 +386,16 @@ static int action_executor_stop_session_handler( * existed. If not, skip the action altogether. */ if (!item->context.session_id.is_set) { - DBG("Session `%s` was not present at the moment the work item was enqueued for %s` action of trigger `%s`", + DBG("Session `%s` was not present at the moment the work item was enqueued for `%s` action of trigger `%s`", session_name, get_action_name(action), get_trigger_name(work_item->trigger)); lttng_action_increase_execution_failure_count(action); - ret = 0; goto end; } session_lock_list(); - session = session_find_by_name(session_name); + rcu_read_lock(); + session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id)); if (!session) { DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`", session_name, get_action_name(action), @@ -411,23 +404,15 @@ static int action_executor_stop_session_handler( goto error_unlock_list; } - /* - * Check if the session id is the same as when the work item was - * enqueued - */ - if (session->id != LTTNG_OPTIONAL_GET(item->context.session_id)) { - DBG("Session id for session `%s` (id: %" PRIu64 - " is not the same that was sampled (id: %" PRIu64 - " at the moment the work item was enqueued for %s` action of trigger `%s`", - session_name, session->id, - LTTNG_OPTIONAL_GET(item->context.session_id), + session_lock(session); + if (session->destroyed) { + DBG("Session `%s` with id = %" PRIu64 " is flagged as destroyed. Skipping: action = `%s`, trigger = `%s`", + session->name, session->id, get_action_name(action), get_trigger_name(work_item->trigger)); - ret = 0; - goto error_put_session; + goto error_unlock_session; } - session_lock(session); if (!is_trigger_allowed_for_session(work_item->trigger, session)) { goto error_unlock_session; } @@ -452,16 +437,16 @@ static int action_executor_stop_session_handler( error_unlock_session: session_unlock(session); -error_put_session: session_put(session); error_unlock_list: + rcu_read_unlock(); session_unlock_list(); end: return ret; } static int action_executor_rotate_session_handler( - struct action_executor *executor, + struct action_executor *executor __attribute__((unused)), const struct action_work_item *work_item, struct action_work_subitem *item) { @@ -486,16 +471,16 @@ static int action_executor_rotate_session_handler( * existed. If not, skip the action altogether. */ if (!item->context.session_id.is_set) { - DBG("Session `%s` was not present at the moment the work item was enqueued for %s` action of trigger `%s`", + DBG("Session `%s` was not present at the moment the work item was enqueued for `%s` action of trigger `%s`", session_name, get_action_name(action), get_trigger_name(work_item->trigger)); lttng_action_increase_execution_failure_count(action); - ret = 0; goto end; } session_lock_list(); - session = session_find_by_name(session_name); + rcu_read_lock(); + session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id)); if (!session) { DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`", session_name, get_action_name(action), @@ -504,23 +489,15 @@ static int action_executor_rotate_session_handler( goto error_unlock_list; } - /* - * Check if the session id is the same as when the work item was - * enqueued. - */ - if (session->id != LTTNG_OPTIONAL_GET(item->context.session_id)) { - DBG("Session id for session `%s` (id: %" PRIu64 - " is not the same that was sampled (id: %" PRIu64 - " at the moment the work item was enqueued for %s` action of trigger `%s`", - session_name, session->id, - LTTNG_OPTIONAL_GET(item->context.session_id), + session_lock(session); + if (session->destroyed) { + DBG("Session `%s` with id = %" PRIu64 " is flagged as destroyed. Skipping: action = `%s`, trigger = `%s`", + session->name, session->id, get_action_name(action), get_trigger_name(work_item->trigger)); - ret = 0; - goto error_put_session; + goto error_unlock_session; } - session_lock(session); if (!is_trigger_allowed_for_session(work_item->trigger, session)) { goto error_unlock_session; } @@ -552,16 +529,16 @@ static int action_executor_rotate_session_handler( error_unlock_session: session_unlock(session); -error_put_session: session_put(session); error_unlock_list: + rcu_read_unlock(); session_unlock_list(); end: return ret; } static int action_executor_snapshot_session_handler( - struct action_executor *executor, + struct action_executor *executor __attribute__((unused)), const struct action_work_item *work_item, struct action_work_subitem *item) { @@ -582,11 +559,10 @@ static int action_executor_snapshot_session_handler( * existed. If not, skip the action altogether. */ if (!item->context.session_id.is_set) { - DBG("Session was not present at the moment the work item was enqueued for %s` action of trigger `%s`", + DBG("Session was not present at the moment the work item was enqueued for `%s` action of trigger `%s`", get_action_name(action), get_trigger_name(work_item->trigger)); lttng_action_increase_execution_failure_count(action); - ret = 0; goto end; } @@ -610,7 +586,8 @@ static int action_executor_snapshot_session_handler( } session_lock_list(); - session = session_find_by_name(session_name); + rcu_read_lock(); + session = session_find_by_id(LTTNG_OPTIONAL_GET(item->context.session_id)); if (!session) { DBG("Failed to find session `%s` by name while executing `%s` action of trigger `%s`", session_name, get_action_name(action), @@ -619,23 +596,15 @@ static int action_executor_snapshot_session_handler( goto error_unlock_list; } - /* - * Check if the session id is the same as when the work item was - * enqueued. - */ - if (session->id != LTTNG_OPTIONAL_GET(item->context.session_id)) { - DBG("Session id for session `%s` (id: %" PRIu64 - " is not the same that was sampled (id: %" PRIu64 - " at the moment the work item was enqueued for %s` action of trigger `%s`", - session_name, session->id, - LTTNG_OPTIONAL_GET(item->context.session_id), + session_lock(session); + if (session->destroyed) { + DBG("Session `%s` with id = %" PRIu64 " is flagged as destroyed. Skipping: action = `%s`, trigger = `%s`", + session->name, session->id, get_action_name(action), get_trigger_name(work_item->trigger)); - ret = 0; - goto error_put_session; + goto error_unlock_session; } - session_lock(session); if (!is_trigger_allowed_for_session(work_item->trigger, session)) { goto error_unlock_session; } @@ -656,17 +625,18 @@ static int action_executor_snapshot_session_handler( error_unlock_session: session_unlock(session); -error_put_session: session_put(session); error_unlock_list: + rcu_read_unlock(); session_unlock_list(); end: return ret; } -static int action_executor_list_handler(struct action_executor *executor, - const struct action_work_item *work_item, - struct action_work_subitem *item) +static int action_executor_list_handler( + struct action_executor *executor __attribute__((unused)), + const struct action_work_item *work_item __attribute__((unused)), + struct action_work_subitem *item __attribute__((unused))) { ERR("Execution of a list action by the action executor should never occur"); abort(); @@ -791,7 +761,7 @@ static void *action_executor_thread(void *_data) work_item->trigger, &trigger_owner_uid); LTTNG_ASSERT(trigger_status == LTTNG_TRIGGER_STATUS_OK); - DBG("Work item skipped since the associated trigger is no longer registered: work item id = %" PRIu64 ", trigger name = '%s', trigger owner uid = %d", + DBG("Work item skipped since the associated trigger is no longer registered: work item id = %" PRIu64 ", trigger name = `%s`, trigger owner uid = %d", work_item->id, trigger_name, (int) trigger_owner_uid); ret = 0; @@ -851,7 +821,7 @@ static void clean_up_action_executor_thread(void *_data) struct action_executor *action_executor_create( struct notification_thread_handle *handle) { - struct action_executor *executor = (action_executor *) zmalloc(sizeof(*executor)); + struct action_executor *executor = zmalloc(); if (!executor) { goto end; @@ -911,6 +881,7 @@ enum action_executor_status action_executor_enqueue_trigger( bool signal = false; LTTNG_ASSERT(trigger); + ASSERT_RCU_READ_LOCKED(); pthread_mutex_lock(&executor->work.lock); /* Check for queue overflow. */ @@ -922,9 +893,9 @@ enum action_executor_status action_executor_enqueue_trigger( goto error_unlock; } - work_item = (action_work_item *) zmalloc(sizeof(*work_item)); + work_item = zmalloc(); if (!work_item) { - PERROR("Failed to allocate action executor work item: trigger name = '%s'", + PERROR("Failed to allocate action executor work item: trigger name = `%s`", get_trigger_name(trigger)); executor_status = ACTION_EXECUTOR_STATUS_ERROR; goto error_unlock;