*
*/
-#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 <common/dynamic-array.h>
-#include <common/macros.h>
-#include <common/optional.h>
-#include <lttng/action/action-internal.h>
-#include <lttng/action/list-internal.h>
+#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 <common/dynamic-array.hpp>
+#include <common/macros.hpp>
+#include <common/optional.hpp>
+#include <lttng/action/action-internal.hpp>
+#include <lttng/action/list-internal.hpp>
#include <lttng/action/list.h>
-#include <lttng/action/notify-internal.h>
+#include <lttng/action/notify-internal.hpp>
#include <lttng/action/notify.h>
#include <lttng/action/rotate-session.h>
#include <lttng/action/snapshot-session.h>
#include <lttng/action/start-session.h>
#include <lttng/action/stop-session.h>
#include <lttng/condition/evaluation.h>
-#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/event-rule-matches-internal.hpp>
#include <lttng/lttng-error.h>
-#include <lttng/trigger/trigger-internal.h>
+#include <lttng/trigger/trigger-internal.hpp>
#include <pthread.h>
#include <stdbool.h>
#include <stddef.h>
* 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);
+ 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_unlock_list;
+ goto error_unlock_session;
}
- session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
- goto error_dispose_session;
+ goto error_unlock_session;
}
cmd_ret = (lttng_error_code) cmd_start_trace(session);
break;
}
-error_dispose_session:
+error_unlock_session:
session_unlock(session);
session_put(session);
error_unlock_list:
* 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);
+ 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),
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_unlock_list;
+ goto error_unlock_session;
}
- session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
- goto error_dispose_session;
+ goto error_unlock_session;
}
cmd_ret = (lttng_error_code) cmd_stop_trace(session);
break;
}
-error_dispose_session:
+error_unlock_session:
session_unlock(session);
session_put(session);
error_unlock_list:
* 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);
+ 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),
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_unlock_list;
+ goto error_unlock_session;
}
- session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
- goto error_dispose_session;
+ goto error_unlock_session;
}
cmd_ret = (lttng_error_code) cmd_rotate_session(session, NULL, false,
break;
}
-error_dispose_session:
+error_unlock_session:
session_unlock(session);
session_put(session);
error_unlock_list:
* 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;
}
}
session_lock_list();
- session = session_find_by_name(session_name);
+ 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),
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_unlock_list;
+ goto error_unlock_session;
}
- session_lock(session);
if (!is_trigger_allowed_for_session(work_item->trigger, session)) {
- goto error_dispose_session;
+ goto error_unlock_session;
}
cmd_ret = (lttng_error_code) cmd_snapshot_record(session, snapshot_output, 0);
break;
}
-error_dispose_session:
+error_unlock_session:
session_unlock(session);
session_put(session);
error_unlock_list:
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;
work_item = (action_work_item *) zmalloc(sizeof(*work_item));
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;