X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Factions%2Faction.c;h=498e41f79405fb2fe71488f91c29b4cdec1ef907;hb=482b3452b2855829d4c28fa370ca97c33c2accd7;hp=64864a6273ae1fabac87cd8e6fd813831335f9d0;hpb=7f4d5b07cf7be895b38b69073389a4fcc318ec29;p=lttng-tools.git

diff --git a/src/common/actions/action.c b/src/common/actions/action.c
index 64864a627..498e41f79 100644
--- a/src/common/actions/action.c
+++ b/src/common/actions/action.c
@@ -8,13 +8,14 @@
 #include <assert.h>
 #include <common/error.h>
 #include <lttng/action/action-internal.h>
-#include <lttng/action/group-internal.h>
+#include <lttng/action/list-internal.h>
 #include <lttng/action/notify-internal.h>
 #include <lttng/action/rate-policy-internal.h>
 #include <lttng/action/rotate-session-internal.h>
 #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)
@@ -22,8 +23,8 @@ const char *lttng_action_type_string(enum lttng_action_type action_type)
 	switch (action_type) {
 	case LTTNG_ACTION_TYPE_UNKNOWN:
 		return "UNKNOWN";
-	case LTTNG_ACTION_TYPE_GROUP:
-		return "GROUP";
+	case LTTNG_ACTION_TYPE_LIST:
+		return "LIST";
 	case LTTNG_ACTION_TYPE_NOTIFY:
 		return "NOTIFY";
 	case LTTNG_ACTION_TYPE_ROTATE_SESSION:
@@ -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;
@@ -188,8 +191,8 @@ ssize_t lttng_action_create_from_payload(struct lttng_payload_view *view,
 		create_from_payload_cb =
 				lttng_action_stop_session_create_from_payload;
 		break;
-	case LTTNG_ACTION_TYPE_GROUP:
-		create_from_payload_cb = lttng_action_group_create_from_payload;
+	case LTTNG_ACTION_TYPE_LIST:
+		create_from_payload_cb = lttng_action_list_create_from_payload;
 		break;
 	default:
 		ERR("Failed to create action from payload, unhandled action type: action-type=%u (%s)",
@@ -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;
+}