X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftrigger.c;h=b79b9e0448c6e624e6e819dc3a1b9fe254dc8382;hb=594c7c002eda287de5f8c8e1859a8841f6fcc90f;hp=0fdcf40499966e3a87be9f6b7f690db1774d4e41;hpb=d602bd6a8ee25d5ca662dde4edb3db3cabf264e1;p=lttng-tools.git

diff --git a/src/common/trigger.c b/src/common/trigger.c
index 0fdcf4049..b79b9e044 100644
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -7,9 +7,9 @@
 
 #include <lttng/trigger/trigger-internal.h>
 #include <lttng/condition/condition-internal.h>
-#include <lttng/condition/event-rule-internal.h>
-#include <lttng/condition/event-rule.h>
-#include <lttng/condition/event-rule-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>
@@ -92,7 +92,6 @@ const struct lttng_condition *lttng_trigger_get_const_condition(
 	return trigger ? trigger->condition : NULL;
 }
 
-
 /*
  * Note: the lack of reference counting 'get' on the action object is normal.
  * This API was exposed as such in 2.11. The client is not expected to call
@@ -394,9 +393,10 @@ bool lttng_trigger_is_equal(
 		return false;
 	}
 
-	/*
-	 * Name is not taken into account since it is cosmetic only.
-	 */
+	if (strcmp(a->name, b->name) != 0) {
+		return false;
+	}
+
 	if (!lttng_condition_is_equal(a->condition, b->condition)) {
 		return false;
 	}
@@ -1013,3 +1013,28 @@ end:
 	lttng_payload_reset(&copy_buffer);
 	return copy;
 }
+
+LTTNG_HIDDEN
+bool lttng_trigger_needs_tracer_notifier(const struct lttng_trigger *trigger)
+{
+	bool needs_tracer_notifier = false;
+	const struct lttng_condition *condition =
+			lttng_trigger_get_const_condition(trigger);
+
+	switch (lttng_condition_get_type(condition)) {
+	case LTTNG_CONDITION_TYPE_ON_EVENT:
+		needs_tracer_notifier = true;
+		goto end;
+	case LTTNG_CONDITION_TYPE_SESSION_CONSUMED_SIZE:
+	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_HIGH:
+	case LTTNG_CONDITION_TYPE_BUFFER_USAGE_LOW:
+	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_ONGOING:
+	case LTTNG_CONDITION_TYPE_SESSION_ROTATION_COMPLETED:
+		goto end;
+	case LTTNG_CONDITION_TYPE_UNKNOWN:
+	default:
+		abort();
+	}
+end:
+	return needs_tracer_notifier;
+}