X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=include%2Flttng%2Ftrigger%2Ftrigger-internal.h;h=6fba6668491d71dd95f9f706a818e7e915c76d1e;hb=94dbd8e4ed88cd56829159e1fef374a16fddd593;hp=21c269befd14b78b26c2aaa3496ed6600d43cf1a;hpb=b61776fb63d4bb14df77c0b5a15de28beed7ddfc;p=lttng-tools.git

diff --git a/include/lttng/trigger/trigger-internal.h b/include/lttng/trigger/trigger-internal.h
index 21c269bef..6fba66684 100644
--- a/include/lttng/trigger/trigger-internal.h
+++ b/include/lttng/trigger/trigger-internal.h
@@ -8,13 +8,14 @@
 #ifndef LTTNG_TRIGGER_INTERNAL_H
 #define LTTNG_TRIGGER_INTERNAL_H
 
-#include <lttng/trigger/trigger.h>
 #include <common/credentials.h>
 #include <common/dynamic-array.h>
 #include <common/macros.h>
 #include <common/optional.h>
-#include <stdint.h>
+#include <lttng/lttng.h>
+#include <pthread.h>
 #include <stdbool.h>
+#include <stdint.h>
 #include <sys/types.h>
 #include <urcu/ref.h>
 
@@ -30,17 +31,31 @@ struct lttng_trigger {
 	char *name;
 	/* For now only the uid portion of the credentials is used. */
 	struct lttng_credentials creds;
-	struct {
-		enum lttng_trigger_firing_policy type;
-		uint64_t threshold;
-		uint64_t current_count;
-	} firing_policy;
 	/*
 	 * Internal use only.
 	 * The unique token passed to the tracer to identify an event-rule
 	 * notification.
 	 */
 	LTTNG_OPTIONAL(uint64_t) tracer_token;
+
+	/*
+	 * Is the trigger registered?
+	 *
+	 * This is necessary since a reference holder might be interested in the
+	 * overall state of the trigger from the point of view of its owner.
+	 *
+	 * The main user is the action executor since we want to prevent the
+	 * execution of actions related to a trigger that is unregistered.
+	 *
+	 * Not considered for `is_equal`.
+	 */
+	bool registered;
+
+	/*
+	 * The lock is used to protect against concurrent trigger execution and
+	 * trigger removal.
+	 */
+	pthread_mutex_t lock;
 };
 
 struct lttng_triggers {
@@ -60,10 +75,6 @@ struct lttng_trigger_comm {
 	uint32_t length;
 	/* Includes '\0' terminator. */
 	uint32_t name_length;
-	/* Firing policy. */
-	/* Maps to enum lttng_trigger_firing_policy. */
-	uint8_t firing_policy_type;
-	uint64_t firing_policy_threshold;
 	/* A null-terminated name, a condition, and an action follow. */
 	char payload[];
 } LTTNG_PACKED;
@@ -162,20 +173,6 @@ LTTNG_HIDDEN
 void lttng_trigger_set_credentials(struct lttng_trigger *trigger,
 		const struct lttng_credentials *creds);
 
-
-/*
- * Fire the trigger.
- * Increments the occurrence count.
- */
-LTTNG_HIDDEN
-void lttng_trigger_fire(struct lttng_trigger *trigger);
-
-/*
- * Check if the trigger would fire.
- */
-LTTNG_HIDDEN
-bool lttng_trigger_should_fire(const struct lttng_trigger *trigger);
-
 /*
  * Return the type of any underlying domain restriction. If no particular
  * requirement is present, returns LTTNG_DOMAIN_NONE.
@@ -193,7 +190,56 @@ enum lttng_error_code lttng_trigger_generate_bytecode(
 		struct lttng_trigger *trigger,
 		const struct lttng_credentials *creds);
 
+/*
+ * Note that the trigger object is not locked by "copy" as it is const and
+ * used with a number of 'const' triggers. If the trigger could be shared at
+ * the moment of the copy, it is the caller's responsability to lock it for
+ * the duration of the copy.
+ */
 LTTNG_HIDDEN
 struct lttng_trigger *lttng_trigger_copy(const struct lttng_trigger *trigger);
 
+/*
+ * A given trigger needs a tracer notifier if
+ *  it has an event-rule condition,
+ *  AND
+ *  it has one or more sessiond-execution action.
+ */
+LTTNG_HIDDEN
+bool lttng_trigger_needs_tracer_notifier(const struct lttng_trigger *trigger);
+
+LTTNG_HIDDEN
+void lttng_trigger_set_as_registered(struct lttng_trigger *trigger);
+
+LTTNG_HIDDEN
+void lttng_trigger_set_as_unregistered(struct lttng_trigger *trigger);
+
+/*
+ * The trigger must be locked before calling lttng_trigger_is_registered.
+ *
+ * The lock is necessary since a trigger can be unregistered at any time.
+ *
+ * Manipulations requiring that the trigger be registered must always acquire
+ * the trigger lock for the duration of the manipulation using
+ * `lttng_trigger_lock` and `lttng_trigger_unlock`.
+ */
+LTTNG_HIDDEN
+bool lttng_trigger_is_registered(struct lttng_trigger *trigger);
+
+LTTNG_HIDDEN
+void lttng_trigger_lock(struct lttng_trigger *trigger);
+
+LTTNG_HIDDEN
+void lttng_trigger_unlock(struct lttng_trigger *trigger);
+
+LTTNG_HIDDEN
+enum lttng_trigger_status lttng_trigger_add_error_results(
+		const struct lttng_trigger *trigger,
+		struct lttng_error_query_results *results);
+
+LTTNG_HIDDEN
+enum lttng_trigger_status lttng_trigger_add_action_error_query_results(
+		struct lttng_trigger *trigger,
+		struct lttng_error_query_results *results);
+
 #endif /* LTTNG_TRIGGER_INTERNAL_H */