Extract synchronize tracer notifier functions

[lttng-tools.git] / src / common / evaluation.c

diff --git a/src/common/evaluation.c b/src/common/evaluation.c
index cb379168e3a20ddab5167add1d839c82519d6cf3..2b06be614a73ddc788987b7ce711bf19e8cef6df 100644 (file)
--- a/src/common/evaluation.c
+++ b/src/common/evaluation.c
@@ -5,10 +5,12 @@
  *
  */
 
+#include <lttng/condition/condition-internal.h>
 #include <lttng/condition/evaluation-internal.h>
 #include <lttng/condition/buffer-usage-internal.h>
 #include <lttng/condition/session-consumed-size-internal.h>
 #include <lttng/condition/session-rotation-internal.h>
+#include <lttng/condition/on-event-internal.h>
 #include <common/macros.h>
 #include <common/error.h>
 #include <stdbool.h>
@@ -48,21 +50,30 @@ end:
 
 LTTNG_HIDDEN
 ssize_t lttng_evaluation_create_from_payload(
+               const struct lttng_condition *condition,
                struct lttng_payload_view *src_view,
                struct lttng_evaluation **evaluation)
 {
        ssize_t ret, evaluation_size = 0;
        const struct lttng_evaluation_comm *evaluation_comm;
-       struct lttng_payload_view evaluation_view =
+       struct lttng_payload_view evaluation_comm_view =
                        lttng_payload_view_from_view(
-                                       src_view, sizeof(*evaluation_comm), -1);
+                                       src_view, 0, sizeof(*evaluation_comm));
+       struct lttng_payload_view evaluation_view =
+                       lttng_payload_view_from_view(src_view,
+                                       sizeof(*evaluation_comm), -1);
 
        if (!src_view || !evaluation) {
                ret = -1;
                goto end;
        }
 
-       evaluation_comm = (typeof(evaluation_comm)) src_view->buffer.data;
+       if (!lttng_payload_view_is_valid(&evaluation_comm_view)) {
+               ret = -1;
+               goto end;
+       }
+
+       evaluation_comm = (typeof(evaluation_comm)) evaluation_comm_view.buffer.data;
        evaluation_size += sizeof(*evaluation_comm);
 
        switch ((enum lttng_condition_type) evaluation_comm->type) {
@@ -106,6 +117,19 @@ ssize_t lttng_evaluation_create_from_payload(
                }
                evaluation_size += ret;
                break;
+       case LTTNG_CONDITION_TYPE_ON_EVENT:
+               assert(condition);
+               assert(condition->type == LTTNG_CONDITION_TYPE_ON_EVENT);
+               ret = lttng_evaluation_on_event_create_from_payload(
+                               container_of(condition,
+                                               const struct lttng_condition_on_event,
+                                               parent),
+                               &evaluation_view, evaluation);
+               if (ret < 0) {
+                       goto end;
+               }
+               evaluation_size += ret;
+               break;
        default:
                ERR("Attempted to create evaluation of unknown type (%i)",
                                (int) evaluation_comm->type);