Force usage of assert() condition when NDEBUG is defined

[lttng-tools.git] / src / common / event-rule / event-rule.c

diff --git a/src/common/event-rule/event-rule.c b/src/common/event-rule/event-rule.c
index e02a1c320d05fc6f25c5ad3d265b2d74a37bd12f..144000e0b2503c97f0295da0c9f63c41eda4565e 100644 (file)
--- a/src/common/event-rule/event-rule.c
+++ b/src/common/event-rule/event-rule.c
@@ -6,21 +6,21 @@
  *
  */
 
-#include <assert.h>
 #include <common/error.h>
-#include <common/macros.h>
-#include <common/payload.h>
-#include <common/payload-view.h>
 #include <common/hashtable/hashtable.h>
 #include <common/hashtable/utils.h>
+#include <common/macros.h>
+#include <common/mi-lttng.h>
+#include <common/payload-view.h>
+#include <common/payload.h>
 #include <lttng/event-rule/event-rule-internal.h>
+#include <lttng/event-rule/jul-logging-internal.h>
 #include <lttng/event-rule/kernel-kprobe-internal.h>
 #include <lttng/event-rule/kernel-syscall-internal.h>
-#include <lttng/event-rule/log4j-logging-internal.h>
-#include <lttng/event-rule/jul-logging-internal.h>
-#include <lttng/event-rule/python-logging-internal.h>
 #include <lttng/event-rule/kernel-tracepoint-internal.h>
 #include <lttng/event-rule/kernel-uprobe-internal.h>
+#include <lttng/event-rule/log4j-logging-internal.h>
+#include <lttng/event-rule/python-logging-internal.h>
 #include <lttng/event-rule/user-tracepoint-internal.h>
 #include <stdbool.h>
 
@@ -51,7 +51,6 @@ enum lttng_domain_type lttng_event_rule_get_domain_type(
                break;
        case LTTNG_EVENT_RULE_TYPE_KERNEL_SYSCALL:
        case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
-       case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
        case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
        case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
                domain_type = LTTNG_DOMAIN_KERNEL;
@@ -69,7 +68,7 @@ static void lttng_event_rule_release(struct urcu_ref *ref)
        struct lttng_event_rule *event_rule =
                        container_of(ref, typeof(*event_rule), ref);
 
-       assert(event_rule->destroy);
+       LTTNG_ASSERT(event_rule->destroy);
        event_rule->destroy(event_rule);
 }
 
@@ -181,9 +180,6 @@ ssize_t lttng_event_rule_create_from_payload(
        case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
                create_from_payload = lttng_event_rule_kernel_kprobe_create_from_payload;
                break;
-       case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-               /* TODO */
-               break;
        case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
                create_from_payload = lttng_event_rule_kernel_uprobe_create_from_payload;
                break;
@@ -218,7 +214,7 @@ ssize_t lttng_event_rule_create_from_payload(
                goto end;
        }
 
-       assert(create_from_payload);
+       LTTNG_ASSERT(create_from_payload);
 
        {
                struct lttng_payload_view child_view =
@@ -264,7 +260,7 @@ void lttng_event_rule_put(struct lttng_event_rule *event_rule)
                return;
        }
 
-       assert(event_rule->ref.refcount);
+       LTTNG_ASSERT(event_rule->ref.refcount);
        urcu_ref_put(&event_rule->ref, lttng_event_rule_release);
 }
 
@@ -273,14 +269,14 @@ enum lttng_error_code lttng_event_rule_generate_filter_bytecode(
                struct lttng_event_rule *rule,
                const struct lttng_credentials *creds)
 {
-       assert(rule->generate_filter_bytecode);
+       LTTNG_ASSERT(rule->generate_filter_bytecode);
        return rule->generate_filter_bytecode(rule, creds);
 }
 
 LTTNG_HIDDEN
 const char *lttng_event_rule_get_filter(const struct lttng_event_rule *rule)
 {
-       assert(rule->get_filter);
+       LTTNG_ASSERT(rule->get_filter);
        return rule->get_filter(rule);
 }
 
@@ -288,7 +284,7 @@ LTTNG_HIDDEN
 const struct lttng_bytecode *lttng_event_rule_get_filter_bytecode(
                const struct lttng_event_rule *rule)
 {
-       assert(rule->get_filter_bytecode);
+       LTTNG_ASSERT(rule->get_filter_bytecode);
        return rule->get_filter_bytecode(rule);
 }
 
@@ -297,7 +293,7 @@ enum lttng_event_rule_generate_exclusions_status
 lttng_event_rule_generate_exclusions(const struct lttng_event_rule *rule,
                struct lttng_event_exclusion **exclusions)
 {
-       assert(rule->generate_exclusions);
+       LTTNG_ASSERT(rule->generate_exclusions);
        return rule->generate_exclusions(rule, exclusions);
 }
 
@@ -305,7 +301,7 @@ LTTNG_HIDDEN
 struct lttng_event *lttng_event_rule_generate_lttng_event(
                const struct lttng_event_rule *rule)
 {
-       assert(rule->generate_lttng_event);
+       LTTNG_ASSERT(rule->generate_lttng_event);
        return rule->generate_lttng_event(rule);
 }
 
@@ -341,8 +337,6 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
                return "kernel syscall";
        case LTTNG_EVENT_RULE_TYPE_KERNEL_KPROBE:
                return "kernel kprobe";
-       case LTTNG_EVENT_RULE_TYPE_KERNEL_FUNCTION:
-               return "function";
        case LTTNG_EVENT_RULE_TYPE_KERNEL_UPROBE:
                return "kernel uprobe";
        case LTTNG_EVENT_RULE_TYPE_KERNEL_TRACEPOINT:
@@ -364,6 +358,44 @@ const char *lttng_event_rule_type_str(enum lttng_event_rule_type type)
 LTTNG_HIDDEN
 unsigned long lttng_event_rule_hash(const struct lttng_event_rule *rule)
 {
-       assert(rule->hash);
+       LTTNG_ASSERT(rule->hash);
        return rule->hash(rule);
 }
+
+LTTNG_HIDDEN
+enum lttng_error_code lttng_event_rule_mi_serialize(
+               const struct lttng_event_rule *rule, struct mi_writer *writer)
+{
+       int ret;
+       enum lttng_error_code ret_code;
+
+       LTTNG_ASSERT(rule);
+       LTTNG_ASSERT(writer);
+       LTTNG_ASSERT(rule->mi_serialize);
+
+       /* Open event rule element. */
+       ret = mi_lttng_writer_open_element(writer, mi_lttng_element_event_rule);
+       if (ret) {
+               goto mi_error;
+       }
+
+       /* Serialize underlying event rule. */
+       ret_code = rule->mi_serialize(rule, writer);
+       if (ret_code != LTTNG_OK) {
+               goto end;
+       }
+
+       /* Close event rule element. */
+       ret = mi_lttng_writer_close_element(writer);
+       if (ret) {
+               goto mi_error;
+       }
+
+       ret_code = LTTNG_OK;
+       goto end;
+
+mi_error:
+       ret_code = LTTNG_ERR_MI_IO_FAIL;
+end:
+       return ret_code;
+}