X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fcommon%2Factions%2Faction.c;h=d4b9c09ebfab716f6a7d2becd13d2e953f1871c9;hp=64864a6273ae1fabac87cd8e6fd813831335f9d0;hb=588c4b0d153e8919b8d9159b69ce0db8fbe52af0;hpb=b99a0cb3edd93f55e712096a352d64b79d4716bb

diff --git a/src/common/actions/action.c b/src/common/actions/action.c
index 64864a627..d4b9c09eb 100644
--- a/src/common/actions/action.c
+++ b/src/common/actions/action.c
@@ -15,6 +15,7 @@
 #include <lttng/action/snapshot-session-internal.h>
 #include <lttng/action/start-session-internal.h>
 #include <lttng/action/stop-session-internal.h>
+#include <lttng/error-query-internal.h>
 
 LTTNG_HIDDEN
 const char *lttng_action_type_string(enum lttng_action_type action_type)
@@ -51,7 +52,8 @@ void lttng_action_init(struct lttng_action *action,
 		action_serialize_cb serialize,
 		action_equal_cb equal,
 		action_destroy_cb destroy,
-		action_get_rate_policy_cb get_rate_policy)
+		action_get_rate_policy_cb get_rate_policy,
+		action_add_error_query_results_cb add_error_query_results)
 {
 	urcu_ref_init(&action->ref);
 	action->type = type;
@@ -60,6 +62,7 @@ void lttng_action_init(struct lttng_action *action,
 	action->equal = equal;
 	action->destroy = destroy;
 	action->get_rate_policy = get_rate_policy;
+	action->add_error_query_results = add_error_query_results;
 
 	action->execution_request_counter = 0;
 	action->execution_counter = 0;
@@ -265,7 +268,7 @@ void lttng_action_increase_execution_count(struct lttng_action *action)
 LTTNG_HIDDEN
 void lttng_action_increase_execution_failure_count(struct lttng_action *action)
 {
-	action->execution_failure_counter++;
+	uatomic_inc(&action->execution_failure_counter);
 }
 
 LTTNG_HIDDEN
@@ -290,3 +293,44 @@ bool lttng_action_should_execute(const struct lttng_action *action)
 end:
 	return execute;
 }
+
+LTTNG_HIDDEN
+enum lttng_action_status lttng_action_add_error_query_results(
+		const struct lttng_action *action,
+		struct lttng_error_query_results *results)
+{
+	return action->add_error_query_results(action, results);
+}
+
+LTTNG_HIDDEN
+enum lttng_action_status lttng_action_generic_add_error_query_results(
+		const struct lttng_action *action,
+		struct lttng_error_query_results *results)
+{
+	enum lttng_action_status action_status;
+	struct lttng_error_query_result *error_counter = NULL;
+	const uint64_t execution_failure_counter =
+			uatomic_read(&action->execution_failure_counter);
+
+	error_counter = lttng_error_query_result_counter_create(
+			"total execution failures",
+			"Aggregated count of errors encountered when executing the action",
+			execution_failure_counter);
+	if (!error_counter) {
+		action_status = LTTNG_ACTION_STATUS_ERROR;
+		goto end;
+	}
+
+	if (lttng_error_query_results_add_result(
+			    results, error_counter)) {
+		action_status = LTTNG_ACTION_STATUS_ERROR;
+		goto end;
+	}
+
+	/* Ownership transferred to the results. */
+	error_counter = NULL;
+	action_status = LTTNG_ACTION_STATUS_OK;
+end:
+	lttng_error_query_result_destroy(error_counter);
+	return action_status;
+}