trigger: implement is_equal

Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I646c13e7fb26fda66b888ce90253e87567b2cab8

diff --git a/include/lttng/trigger/trigger-internal.h b/include/lttng/trigger/trigger-internal.h
index a554a31e536131a16d48f4e00088297f6ffe69d9..6d05b6d1d3ed38b2f789e30f731d6ec6d6a18276 100644 (file)
--- a/include/lttng/trigger/trigger-internal.h
+++ b/include/lttng/trigger/trigger-internal.h
@@ -61,6 +61,10 @@ const struct lttng_action *lttng_trigger_get_const_action(
 LTTNG_HIDDEN
 bool lttng_trigger_validate(struct lttng_trigger *trigger);
 
 LTTNG_HIDDEN
 bool lttng_trigger_validate(struct lttng_trigger *trigger);
 

+LTTNG_HIDDEN
+bool lttng_trigger_is_equal(
+               const struct lttng_trigger *a, const struct lttng_trigger *b);
+

 LTTNG_HIDDEN
 void lttng_trigger_get(struct lttng_trigger *trigger);
 
 LTTNG_HIDDEN
 void lttng_trigger_get(struct lttng_trigger *trigger);
 

diff --git a/src/bin/lttng-sessiond/notification-thread-events.c b/src/bin/lttng-sessiond/notification-thread-events.c
index 9e9a83888d81dac23e933c686846d0b8572b0e3a..e52e4bd979cbe9108a599522a1eca74e848e541d 100644 (file)
--- a/src/bin/lttng-sessiond/notification-thread-events.c
+++ b/src/bin/lttng-sessiond/notification-thread-events.c
@@ -27,6 +27,7 @@
 #include <lttng/condition/session-consumed-size-internal.h>
 #include <lttng/condition/session-rotation-internal.h>
 #include <lttng/notification/channel-internal.h>
 #include <lttng/condition/session-consumed-size-internal.h>
 #include <lttng/condition/session-rotation-internal.h>
 #include <lttng/notification/channel-internal.h>

+#include <lttng/trigger/trigger-internal.h>

 
 #include <time.h>
 #include <unistd.h>
 
 #include <time.h>
 #include <unistd.h>

diff --git a/src/common/trigger.c b/src/common/trigger.c
index 5ae84f3d9e8f6ef28cb6323cd8b83c62101291f8..e6849fccfa52789a022de29b4344f2ead73fbffd 100644 (file)
--- a/src/common/trigger.c
+++ b/src/common/trigger.c
@@ -263,6 +263,29 @@ end:
        return ret;
 }
 
        return ret;
 }
 

+LTTNG_HIDDEN
+bool lttng_trigger_is_equal(
+               const struct lttng_trigger *a, const struct lttng_trigger *b)
+{
+       /*
+        * Name is not taken into account since it is cosmetic only.
+        */
+       if (!lttng_condition_is_equal(a->condition, b->condition)) {
+               return false;
+       }
+
+       if (!lttng_action_is_equal(a->action, b->action)) {
+               return false;
+       }
+
+       if (!lttng_credentials_is_equal(lttng_trigger_get_credentials(a),
+                       lttng_trigger_get_credentials(b))) {
+               return false;
+       }
+
+       return true;
+}
+

 LTTNG_HIDDEN
 void lttng_trigger_get(struct lttng_trigger *trigger)
 {
 LTTNG_HIDDEN
 void lttng_trigger_get(struct lttng_trigger *trigger)
 {