X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Fevaluation.c;h=6b3e634947253812329f099770d2345f999622b1;hb=3afa94aeca5a0daae40fd7b6cc96b7e4c150c7d8;hp=b76d349fa40526225d9b7199a0d919955a1d8bfb;hpb=3e6e0df2f8f9f23d252c2508b6d741916dfcc4b3;p=lttng-tools.git

diff --git a/src/common/evaluation.c b/src/common/evaluation.c
index b76d349fa..6b3e63494 100644
--- a/src/common/evaluation.c
+++ b/src/common/evaluation.c
@@ -5,23 +5,22 @@
  *
  */
 
+#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/event-rule-matches-internal.h>
 #include <common/macros.h>
 #include <common/error.h>
 #include <stdbool.h>
-#include <assert.h>
 
-LTTNG_HIDDEN
 void lttng_evaluation_init(struct lttng_evaluation *evaluation,
 		enum lttng_condition_type type)
 {
 	evaluation->type = type;
 }
 
-LTTNG_HIDDEN
 int lttng_evaluation_serialize(const struct lttng_evaluation *evaluation,
 		struct lttng_payload *payload)
 {
@@ -46,8 +45,8 @@ end:
 	return ret;
 }
 
-LTTNG_HIDDEN
 ssize_t lttng_evaluation_create_from_payload(
+		const struct lttng_condition *condition,
 		struct lttng_payload_view *src_view,
 		struct lttng_evaluation **evaluation)
 {
@@ -114,6 +113,20 @@ ssize_t lttng_evaluation_create_from_payload(
 		}
 		evaluation_size += ret;
 		break;
+	case LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES:
+		LTTNG_ASSERT(condition);
+		LTTNG_ASSERT(condition->type ==
+				LTTNG_CONDITION_TYPE_EVENT_RULE_MATCHES);
+		ret = lttng_evaluation_event_rule_matches_create_from_payload(
+				container_of(condition,
+						const struct lttng_condition_event_rule_matches,
+						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);
@@ -138,6 +151,6 @@ void lttng_evaluation_destroy(struct lttng_evaluation *evaluation)
 		return;
 	}
 
-	assert(evaluation->destroy);
+	LTTNG_ASSERT(evaluation->destroy);
 	evaluation->destroy(evaluation);
 }