X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Flttng%2Faction%2Faction-internal.h;h=e97d4f032bd430b919c9b5837a2cbbb233e20ecf;hb=0f7c296359bf90005e1dadf2d7a02a4b223a8031;hp=1422a6dceed667050da6870928a6d02ecd0d2db2;hpb=2d57482cbac710612a36b7beae7b59c277006185;p=lttng-tools.git

diff --git a/include/lttng/action/action-internal.h b/include/lttng/action/action-internal.h
index 1422a6dce..e97d4f032 100644
--- a/include/lttng/action/action-internal.h
+++ b/include/lttng/action/action-internal.h
@@ -8,17 +8,21 @@
 #ifndef LTTNG_ACTION_INTERNAL_H
 #define LTTNG_ACTION_INTERNAL_H
 
-#include <lttng/action/action.h>
-#include <common/macros.h>
 #include <common/buffer-view.h>
 #include <common/dynamic-buffer.h>
+#include <common/macros.h>
 #include <common/payload-view.h>
 #include <common/payload.h>
+#include <lttng/lttng.h>
+#include <pthread.h>
 #include <stdbool.h>
 #include <sys/types.h>
 #include <urcu/ref.h>
 
-struct lttng_firing_policy;
+struct lttng_rate_policy;
+struct mi_writer;
+struct mi_lttng_error_query_callbacks;
+struct lttng_trigger;
 
 typedef bool (*action_validate_cb)(struct lttng_action *action);
 typedef void (*action_destroy_cb)(struct lttng_action *action);
@@ -29,8 +33,13 @@ typedef bool (*action_equal_cb)(const struct lttng_action *a,
 typedef ssize_t (*action_create_from_payload_cb)(
 		struct lttng_payload_view *view,
 		struct lttng_action **action);
-typedef const struct lttng_firing_policy *(*action_get_firing_policy_cb)(
+typedef const struct lttng_rate_policy *(*action_get_rate_policy_cb)(
 		const struct lttng_action *action);
+typedef enum lttng_action_status (*action_add_error_query_results_cb)(
+		const struct lttng_action *action,
+		struct lttng_error_query_results *results);
+typedef enum lttng_error_code (*action_mi_serialize_cb)(
+		const struct lttng_action *condition, struct mi_writer *writer);
 
 struct lttng_action {
 	struct urcu_ref ref;
@@ -39,7 +48,9 @@ struct lttng_action {
 	action_serialize_cb serialize;
 	action_equal_cb equal;
 	action_destroy_cb destroy;
-	action_get_firing_policy_cb get_firing_policy;
+	action_get_rate_policy_cb get_rate_policy;
+	action_add_error_query_results_cb add_error_query_results;
+	action_mi_serialize_cb mi_serialize;
 
 	/* Internal use only. */
 
@@ -47,13 +58,15 @@ struct lttng_action {
 	uint64_t execution_request_counter;
 	/*
 	 * The number of time the action was actually executed.
-	 * Action firing policy can impact on this number.
+	 * Action rate policy can impact on this number.
 	 * */
 	uint64_t execution_counter;
 	/*
 	 * The number of time the action execution failed.
+	 * An unsigned long is used to use a type which makes atomic
+	 * operations possible.
 	 */
-	uint64_t execution_failure_counter;
+	unsigned long execution_failure_counter;
 };
 
 struct lttng_action_comm {
@@ -68,7 +81,9 @@ void lttng_action_init(struct lttng_action *action,
 		action_serialize_cb serialize,
 		action_equal_cb equal,
 		action_destroy_cb destroy,
-		action_get_firing_policy_cb get_firing_policy);
+		action_get_rate_policy_cb get_rate_policy,
+		action_add_error_query_results_cb add_error_query_results,
+		action_mi_serialize_cb mi);
 
 LTTNG_HIDDEN
 bool lttng_action_validate(struct lttng_action *action);
@@ -106,4 +121,26 @@ void lttng_action_increase_execution_failure_count(struct lttng_action *action);
 LTTNG_HIDDEN
 bool lttng_action_should_execute(const struct lttng_action *action);
 
+LTTNG_HIDDEN
+enum lttng_action_status lttng_action_add_error_query_results(
+		const struct lttng_action *action,
+		struct lttng_error_query_results *results);
+
+/*
+ * For use by the various lttng_action implementation. Implements the default
+ * behavior to the generic error "execution failure counter" that all actions
+ * (except list, which passes-through) provide.
+ */
+LTTNG_HIDDEN
+enum lttng_action_status lttng_action_generic_add_error_query_results(
+		const struct lttng_action *action,
+		struct lttng_error_query_results *results);
+LTTNG_HIDDEN
+enum lttng_error_code lttng_action_mi_serialize(const struct lttng_trigger *trigger,
+		const struct lttng_action *action,
+		struct mi_writer *writer,
+		const struct mi_lttng_error_query_callbacks
+				*error_query_callbacks,
+		struct lttng_dynamic_array *action_path_indexes);
+
 #endif /* LTTNG_ACTION_INTERNAL_H */