Add deserialization of trigger class

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/include/lttng/trigger/trigger-internal.h b/include/lttng/trigger/trigger-internal.h
index bd9cf6900ce321982cf9227c7135e10a8606c885..eab0de7ab26256426eb901e7b1f7ab401becb993 100644 (file)
--- a/include/lttng/trigger/trigger-internal.h
+++ b/include/lttng/trigger/trigger-internal.h
@@ -20,10 +20,27 @@
 
 #include <lttng/trigger/trigger.h>
 #include <common/macros.h>
+#include <stdint.h>
+#include <stdbool.h>
 
 struct lttng_trigger {
        struct lttng_condition *condition;
        struct lttng_action *action;
 };
 
+struct lttng_trigger_comm {
+       /* len excludes its own length. */
+       uint32_t len;
+} LTTNG_PACKED;
+
+LTTNG_HIDDEN
+ssize_t lttng_trigger_create_from_buffer(const char *buf,
+               struct lttng_trigger **trigger);
+
+LTTNG_HIDDEN
+ssize_t lttng_trigger_serialize(struct lttng_trigger *trigger, char *buf);
+
+LTTNG_HIDDEN
+bool lttng_trigger_validate(struct lttng_trigger *trigger);
+
 #endif /* LTTNG_TRIGGER_INTERNAL_H */

diff --git a/src/lib/lttng-ctl/trigger.c b/src/lib/lttng-ctl/trigger.c
index b2b51b86541143fdf944ba49b624f24f78086065..1d79a61a578fe8c6fdd4f3c92ad05ecd4e45343d 100644 (file)
--- a/src/lib/lttng-ctl/trigger.c
+++ b/src/lib/lttng-ctl/trigger.c
@@ -20,6 +20,22 @@
 #include <lttng/action/action-internal.h>
 #include <assert.h>
 
+LTTNG_HIDDEN
+bool lttng_trigger_validate(struct lttng_trigger *trigger)
+{
+       bool valid;
+
+       if (!trigger) {
+               valid = false;
+               goto end;
+       }
+
+       valid = lttng_condition_validate(trigger->condition) &&
+                       lttng_action_validate(trigger->action);
+end:
+       return valid;
+}
+
 struct lttng_trigger *lttng_trigger_create(
                struct lttng_condition *condition,
                struct lttng_action *action)
@@ -52,6 +68,51 @@ void lttng_trigger_destroy(struct lttng_trigger *trigger)
        free(trigger);
 }
 
+LTTNG_HIDDEN
+ssize_t lttng_trigger_create_from_buffer(const char *buf,
+               struct lttng_trigger **trigger)
+{
+       ssize_t ret, trigger_size;
+       struct lttng_condition *condition = NULL;
+       struct lttng_action *action = NULL;
+
+       if (!buf || !trigger) {
+               ret = -1;
+               goto end;
+       }
+
+       ret = lttng_condition_create_from_buffer(buf, &condition);
+       if (ret < 0) {
+               goto end;
+       }
+
+       trigger_size = ret;
+       buf += ret;
+       ret = lttng_action_create_from_buffer(buf, &action);
+       if (ret < 0) {
+               goto end;
+       }
+
+       trigger_size += ret;
+       *trigger = lttng_trigger_create(condition, action);
+       if (!*trigger) {
+               goto error;
+       }
+       ret = trigger_size;
+end:
+       return ret;
+error:
+       lttng_condition_destroy(condition);
+       lttng_action_destroy(action);
+       return ret;
+}
+
+/*
+ * Returns the size of a trigger's condition and action.
+ * Both elements are stored contiguously, see their "*_comm" structure
+ * for the detailed format.
+ */
+LTTNG_HIDDEN
 ssize_t lttng_trigger_serialize(struct lttng_trigger *trigger, char *buf)
 {
        ssize_t action_size, condition_size, ret;
@@ -61,18 +122,35 @@ ssize_t lttng_trigger_serialize(struct lttng_trigger *trigger, char *buf)
                goto end;
        }
 
+       condition_size = lttng_condition_serialize(trigger->condition, NULL);
+       if (condition_size < 0) {
+               ret = -1;
+               goto end;
+       }
+
+       action_size = lttng_action_serialize(trigger->action, NULL);
+       if (action_size < 0) {
+               ret = -1;
+               goto end;
+       }
+
+       ret = action_size + condition_size;
+       if (!buf) {
+               goto end;
+       }
+
        condition_size = lttng_condition_serialize(trigger->condition, buf);
        if (condition_size < 0) {
                ret = -1;
                goto end;
        }
 
+       buf += condition_size;
        action_size = lttng_action_serialize(trigger->action, buf);
        if (action_size < 0) {
                ret = -1;
                goto end;
        }
-       ret = action_size + condition_size;
 end:
        return ret;
 }