X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Ftrigger.c;h=34d4208076a22eec5d9e6d003ec880e887f08d40;hb=8dbb86b8a981917165030d3a7fbbc2cb932888ed;hp=125c871eaf80c98d63579713866d88339de4f760;hpb=e45dd625d3e802d8e6e2ec3de180c73546e8f9fe;p=lttng-tools.git

diff --git a/src/common/trigger.c b/src/common/trigger.c
index 125c871ea..34d420807 100644
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -5,24 +5,24 @@
  *
  */
 
-#include <lttng/trigger/trigger-internal.h>
-#include <lttng/condition/condition-internal.h>
-#include <lttng/condition/on-event-internal.h>
-#include <lttng/condition/on-event.h>
-#include <lttng/condition/on-event-internal.h>
-#include <lttng/condition/buffer-usage.h>
-#include <lttng/event-rule/event-rule-internal.h>
-#include <lttng/event-expr-internal.h>
-#include <lttng/action/action-internal.h>
+#include <assert.h>
 #include <common/credentials.h>
-#include <common/payload.h>
-#include <common/payload-view.h>
-#include <lttng/domain.h>
-#include <common/error.h>
 #include <common/dynamic-array.h>
+#include <common/error.h>
 #include <common/optional.h>
-#include <assert.h>
+#include <common/payload-view.h>
+#include <common/payload.h>
 #include <inttypes.h>
+#include <lttng/action/action-internal.h>
+#include <lttng/condition/buffer-usage.h>
+#include <lttng/condition/condition-internal.h>
+#include <lttng/condition/event-rule-matches-internal.h>
+#include <lttng/condition/event-rule-matches.h>
+#include <lttng/domain.h>
+#include <lttng/event-expr-internal.h>
+#include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/trigger/trigger-internal.h>
+#include <pthread.h>
 
 LTTNG_HIDDEN
 bool lttng_trigger_validate(const struct lttng_trigger *trigger)
@@ -68,6 +68,9 @@ struct lttng_trigger *lttng_trigger_create(
 	lttng_action_get(action);
 	trigger->action = action;
 
+	pthread_mutex_init(&trigger->lock, NULL);
+	trigger->registered = false;
+
 end:
 	return trigger;
 }
@@ -121,6 +124,8 @@ static void trigger_destroy_ref(struct urcu_ref *ref)
 	lttng_action_put(action);
 	lttng_condition_put(condition);
 
+	pthread_mutex_destroy(&trigger->lock);
+
 	free(trigger->name);
 	free(trigger);
 }
@@ -699,6 +704,7 @@ enum lttng_trigger_status lttng_trigger_set_owner_uid(
 		struct lttng_trigger *trigger, uid_t uid)
 {
 	enum lttng_trigger_status ret = LTTNG_TRIGGER_STATUS_OK;
+	const uid_t euid = geteuid();
 	const struct lttng_credentials creds = {
 		.uid = LTTNG_OPTIONAL_INIT_VALUE(uid),
 		.gid = LTTNG_OPTIONAL_INIT_UNSET,
@@ -710,7 +716,7 @@ enum lttng_trigger_status lttng_trigger_set_owner_uid(
 	}
 
 	/* Client-side validation only to report a clearer error. */
-	if (geteuid() != 0) {
+	if (euid != 0 && euid != uid) {
 		ret = LTTNG_TRIGGER_STATUS_PERMISSION_DENIED;
 		goto end;
 	}
@@ -766,9 +772,9 @@ enum lttng_domain_type lttng_trigger_get_underlying_domain_type_restriction(
 		/* Apply to any domain. */
 		type = LTTNG_DOMAIN_NONE;
 		break;
-	case LTTNG_CONDITION_TYPE_ON_EVENT:
+	case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
 		/* Return the domain of the event rule. */
-		c_status = lttng_condition_on_event_get_rule(
+		c_status = lttng_condition_event_rule_matches_get_rule(
 				trigger->condition, &event_rule);
 		assert(c_status == LTTNG_CONDITION_STATUS_OK);
 		type = lttng_event_rule_get_domain_type(event_rule);
@@ -806,12 +812,12 @@ enum lttng_error_code lttng_trigger_generate_bytecode(
 	}
 
 	switch (lttng_condition_get_type(condition)) {
-	case LTTNG_CONDITION_TYPE_ON_EVENT:
+	case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
 	{
 		struct lttng_event_rule *event_rule;
 		const enum lttng_condition_status condition_status =
-				lttng_condition_on_event_borrow_rule_mutable(
-					condition, &event_rule);
+				lttng_condition_event_rule_matches_borrow_rule_mutable(
+						condition, &event_rule);
 
 		assert(condition_status == LTTNG_CONDITION_STATUS_OK);
 
@@ -823,7 +829,7 @@ enum lttng_error_code lttng_trigger_generate_bytecode(
 		}
 
 		/* Generate the capture bytecode. */
-		ret = lttng_condition_on_event_generate_capture_descriptor_bytecode(
+		ret = lttng_condition_event_rule_matches_generate_capture_descriptor_bytecode(
 				condition);
 		if (ret != LTTNG_OK) {
 			goto end;
@@ -879,7 +885,7 @@ bool lttng_trigger_needs_tracer_notifier(const struct lttng_trigger *trigger)
 			lttng_trigger_get_const_condition(trigger);
 
 	switch (lttng_condition_get_type(condition)) {
-	case LTTNG_CONDITION_TYPE_ON_EVENT:
+	case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
 		needs_tracer_notifier = true;
 		goto end;
 	case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
@@ -895,3 +901,45 @@ bool lttng_trigger_needs_tracer_notifier(const struct lttng_trigger *trigger)
 end:
 	return needs_tracer_notifier;
 }
+
+LTTNG_HIDDEN
+void lttng_trigger_set_as_registered(struct lttng_trigger *trigger)
+{
+	pthread_mutex_lock(&trigger->lock);
+	trigger->registered = true;
+	pthread_mutex_unlock(&trigger->lock);
+}
+
+LTTNG_HIDDEN
+void lttng_trigger_set_as_unregistered(struct lttng_trigger *trigger)
+{
+	pthread_mutex_lock(&trigger->lock);
+	trigger->registered = false;
+	pthread_mutex_unlock(&trigger->lock);
+}
+
+/*
+ * The trigger must be locked before calling lttng_trigger_registered.
+ * The lock is necessary since a trigger can be unregistered at anytime.
+ * 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)
+{
+	ASSERT_LOCKED(trigger->lock);
+	return trigger->registered;
+}
+
+LTTNG_HIDDEN
+void lttng_trigger_lock(struct lttng_trigger *trigger)
+{
+	pthread_mutex_lock(&trigger->lock);
+}
+
+LTTNG_HIDDEN
+void lttng_trigger_unlock(struct lttng_trigger *trigger)
+{
+	pthread_mutex_unlock(&trigger->lock);
+}