Build fix: Missing message in LTTNG_DEPRECATED invocation

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

diff --git a/src/common/evaluation.c b/src/common/evaluation.c
index 16c3ef39ca80b6a825f560619b29d3d0f7bdee71..6b3e634947253812329f099770d2345f999622b1 100644 (file)
--- a/src/common/evaluation.c
+++ b/src/common/evaluation.c
@@ -10,20 +10,17 @@
 #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-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)
 {
@@ -48,7 +45,6 @@ end:
        return ret;
 }
 
-LTTNG_HIDDEN
 ssize_t lttng_evaluation_create_from_payload(
                const struct lttng_condition *condition,
                struct lttng_payload_view *src_view,
@@ -117,12 +113,13 @@ ssize_t lttng_evaluation_create_from_payload(
                }
                evaluation_size += ret;
                break;
-       case LTTNG_CONDITION_TYPE_EVENT_RULE_HIT:
-               assert(condition);
-               assert(condition->type == LTTNG_CONDITION_TYPE_EVENT_RULE_HIT);
-               ret = lttng_evaluation_event_rule_create_from_payload(
+       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,
+                                               const struct lttng_condition_event_rule_matches,
                                                parent),
                                &evaluation_view, evaluation);
                if (ret < 0) {
@@ -154,6 +151,6 @@ void lttng_evaluation_destroy(struct lttng_evaluation *evaluation)
                return;
        }
 
-       assert(evaluation->destroy);
+       LTTNG_ASSERT(evaluation->destroy);
        evaluation->destroy(evaluation);
 }