Replace assert() -> BT_ASSERT() and some preconditions with BT_ASSERT_PRE()
[babeltrace.git] / lib / ctf-ir / event.c
index 6438564459c1d80308307d49fc9a0e5a6eeb0f80..2fa1e953b19c12b21c736cb6c7fde3f5c51daf59 100644 (file)
 #include <babeltrace/ref.h>
 #include <babeltrace/ctf-ir/attributes-internal.h>
 #include <babeltrace/compiler-internal.h>
+#include <babeltrace/assert-internal.h>
+#include <babeltrace/assert-pre-internal.h>
 #include <inttypes.h>
 
+#define BT_ASSERT_PRE_EVENT_HOT(_event, _name)                         \
+       BT_ASSERT_PRE_HOT((_event), (_name), ": +%!+e", (_event))
+
 static
 void bt_event_destroy(struct bt_object *obj);
 
@@ -81,29 +86,18 @@ struct bt_event *bt_event_create(struct bt_event_class *event_class)
        int trace_valid = 0;
        struct bt_clock_class *expected_clock_class = NULL;
 
+       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
        BT_LOGD("Creating event object: event-class-addr=%p, "
                "event-class-name=\"%s\", event-class-id=%" PRId64,
                event_class, bt_event_class_get_name(event_class),
                bt_event_class_get_id(event_class));
 
-       if (!event_class) {
-               BT_LOGW_STR("Invalid parameter: event class is NULL.");
-               goto error;
-       }
-
        stream_class = bt_event_class_get_stream_class(event_class);
-
-       /*
-        * We disallow the creation of an event if its event class has not been
-        * associated to a stream class.
-        */
-       if (!stream_class) {
-               BT_LOGW_STR("Event class is not part of a stream class.");
-               goto error;
-       }
+       BT_ASSERT_PRE(stream_class,
+               "Event class is not part of a stream class: %!+E", event_class);
 
        /* The event class was frozen when added to its stream class */
-       assert(event_class->frozen);
+       BT_ASSERT(event_class->frozen);
 
        if (!stream_class->frozen) {
                if (stream_class->clock) {
@@ -145,7 +139,7 @@ struct bt_event *bt_event_create(struct bt_event_class *event_class)
                BT_LOGD_STR("Event's class is part of a trace.");
                packet_header_type = bt_trace_get_packet_header_type(trace);
                trace_valid = trace->valid;
-               assert(trace_valid);
+               BT_ASSERT(trace_valid);
                environment = trace->environment;
        }
 
@@ -325,38 +319,27 @@ error:
        BT_PUT(event_context);
        BT_PUT(event_payload);
        bt_put(expected_clock_class);
-       assert(!packet_header_type);
-       assert(!packet_context_type);
-       assert(!event_header_type);
-       assert(!stream_event_ctx_type);
-       assert(!event_context_type);
-       assert(!event_payload_type);
-
+       BT_ASSERT(!packet_header_type);
+       BT_ASSERT(!packet_context_type);
+       BT_ASSERT(!event_header_type);
+       BT_ASSERT(!stream_event_ctx_type);
+       BT_ASSERT(!event_context_type);
+       BT_ASSERT(!event_payload_type);
        return event;
 }
 
 struct bt_event_class *bt_event_get_class(struct bt_event *event)
 {
-       struct bt_event_class *event_class = NULL;
-
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
-
-       event_class = bt_get(bt_event_borrow_event_class(event));
-end:
-       return event_class;
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       return bt_get(bt_event_borrow_event_class(event));
 }
 
-struct bt_stream *bt_event_get_stream(struct bt_event *event)
+BT_HIDDEN
+struct bt_stream *bt_event_borrow_stream(struct bt_event *event)
 {
        struct bt_stream *stream = NULL;
 
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
+       BT_ASSERT(event);
 
        /*
         * If the event has a parent, then this is its (writer) stream.
@@ -364,64 +347,45 @@ struct bt_stream *bt_event_get_stream(struct bt_event *event)
         * is its (non-writer) stream.
         */
        if (event->base.parent) {
-               stream = (struct bt_stream *) bt_object_get_parent(event);
+               stream = (struct bt_stream *) bt_object_borrow_parent(event);
        } else {
                if (event->packet) {
-                       stream = bt_get(event->packet->stream);
+                       stream = event->packet->stream;
                }
        }
 
-end:
        return stream;
 }
 
-int bt_event_set_payload(struct bt_event *event,
-               const char *name,
+struct bt_stream *bt_event_get_stream(struct bt_event *event)
+{
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       return bt_get(bt_event_borrow_stream(event));
+}
+
+int bt_event_set_payload(struct bt_event *event, const char *name,
                struct bt_field *payload)
 {
        int ret = 0;
 
-       if (!event || !payload) {
-               BT_LOGW("Invalid parameter: event or payload field is NULL: "
-                       "event-addr=%p, payload-field-addr=%p",
-                       event, payload);
-               ret = -1;
-               goto end;
-       }
-
-       if (event->frozen) {
-               BT_LOGW("Invalid parameter: event is frozen: addr=%p, "
-                       "event-class-name=\"%s\", event-class-id=%" PRId64,
-                       event, bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class));
-               ret = -1;
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_NON_NULL(payload, "Payload field");
+       BT_ASSERT_PRE_EVENT_HOT(event, "Event");
 
        if (name) {
                ret = bt_field_structure_set_field_by_name(
                        event->fields_payload, name, payload);
        } else {
-               struct bt_field_type *payload_type;
-
-               payload_type = bt_field_get_type(payload);
-
-               if (bt_field_type_compare(payload_type,
-                               event->event_class->fields) == 0) {
-                       bt_put(event->fields_payload);
-                       bt_get(payload);
-                       event->fields_payload = payload;
-               } else {
-                       BT_LOGW("Invalid parameter: payload field type is different from the expected field type: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64,
-                               event,
-                               bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class));
-                       ret = -1;
-               }
+               BT_ASSERT_PRE(bt_field_type_compare(payload->type,
+                       event->event_class->fields) == 0,
+                       "Payload field's type is different from the "
+                       "expected field type: %![event-]+e, %![ft-]+F, "
+                       "%![expected-ft-]+F",
+                       event, payload->type, event->event_class->fields);
 
-               bt_put(payload_type);
+               bt_put(event->fields_payload);
+               bt_get(payload);
+               event->fields_payload = payload;
        }
 
        if (ret) {
@@ -440,7 +404,6 @@ int bt_event_set_payload(struct bt_event *event,
                        name, payload);
        }
 
-end:
        return ret;
 }
 
@@ -448,10 +411,7 @@ struct bt_field *bt_event_get_event_payload(struct bt_event *event)
 {
        struct bt_field *payload = NULL;
 
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (!event->fields_payload) {
                BT_LOGV("Event has no current payload field: addr=%p, "
@@ -463,6 +423,7 @@ struct bt_field *bt_event_get_event_payload(struct bt_event *event)
 
        payload = event->fields_payload;
        bt_get(payload);
+
 end:
        return payload;
 }
@@ -478,10 +439,7 @@ struct bt_field *bt_event_get_payload(struct bt_event *event,
 {
        struct bt_field *field = NULL;
 
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (name) {
                field = bt_field_structure_get_field_by_name(
@@ -490,7 +448,7 @@ struct bt_field *bt_event_get_payload(struct bt_event *event,
                field = event->fields_payload;
                bt_get(field);
        }
-end:
+
        return field;
 }
 
@@ -499,26 +457,18 @@ struct bt_field *bt_event_get_payload_by_index(
 {
        struct bt_field *field = NULL;
 
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
-
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
        field = bt_field_structure_get_field_by_index(event->fields_payload,
                index);
-end:
+
        return field;
 }
 
-struct bt_field *bt_event_get_header(
-               struct bt_event *event)
+struct bt_field *bt_event_get_header(struct bt_event *event)
 {
        struct bt_field *header = NULL;
 
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (!event->event_header) {
                BT_LOGV("Event has no current header field: addr=%p, "
@@ -530,64 +480,35 @@ struct bt_field *bt_event_get_header(
 
        header = event->event_header;
        bt_get(header);
+
 end:
        return header;
 }
 
-int bt_event_set_header(struct bt_event *event,
-               struct bt_field *header)
+int bt_event_set_header(struct bt_event *event, struct bt_field *header)
 {
-       int ret = 0;
-       struct bt_field_type *field_type = NULL;
-       struct bt_stream_class *stream_class = NULL;
-
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               ret = -1;
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_EVENT_HOT(event, "Event");
 
-       if (event->frozen) {
-               BT_LOGW("Invalid parameter: event is frozen: addr=%p, "
-                       "event-class-name=\"%s\", event-class-id=%" PRId64,
-                       event, bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class));
-               ret = -1;
-               goto end;
-       }
-
-       stream_class = (struct bt_stream_class *) bt_object_get_parent(
-                       event->event_class);
        /*
         * Ensure the provided header's type matches the one registered to the
         * stream class.
         */
        if (header) {
-               field_type = bt_field_get_type(header);
-               if (bt_field_type_compare(field_type,
-                               stream_class->event_header_type)) {
-                       BT_LOGW("Invalid parameter: header field type is different from the expected field type: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64,
-                               event,
-                               bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class));
-                       ret = -1;
-                       goto end;
-               }
+               BT_ASSERT_PRE(bt_field_type_compare(header->type,
+                       bt_event_class_borrow_stream_class(event->event_class)->event_header_type) == 0,
+                       "Header field's type is different from the "
+                       "expected field type: %![event-]+e, %![ft-]+F, "
+                       "%![expected-ft-]+F",
+                       event, header->type,
+                       bt_event_class_borrow_stream_class(event->event_class)->event_header_type);
        } else {
-               if (stream_class->event_header_type) {
-                       BT_LOGW("Invalid parameter: setting no event header but event header field type is not NULL: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64 ", "
-                               "event-header-ft-addr=%p",
-                               event,
-                               bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class),
-                               stream_class->event_header_type);
-                       ret = -1;
-                       goto end;
-               }
+               BT_ASSERT_PRE(!bt_event_class_borrow_stream_class(event->event_class)->event_header_type,
+                       "Setting no event header field, "
+                       "but event header field type is not NULL: ",
+                       "%![event-]+e, %![header-ft-]+F",
+                       event,
+                       bt_event_class_borrow_stream_class(event->event_class)->event_header_type);
        }
 
        bt_put(event->event_header);
@@ -597,21 +518,14 @@ int bt_event_set_header(struct bt_event *event,
                "header-field-addr=%p",
                event, bt_event_class_get_name(event->event_class),
                bt_event_class_get_id(event->event_class), header);
-end:
-       bt_put(stream_class);
-       bt_put(field_type);
-       return ret;
+       return 0;
 }
 
-struct bt_field *bt_event_get_event_context(
-               struct bt_event *event)
+struct bt_field *bt_event_get_event_context(struct bt_event *event)
 {
        struct bt_field *context = NULL;
 
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (!event->context_payload) {
                BT_LOGV("Event has no current context field: addr=%p, "
@@ -623,58 +537,29 @@ struct bt_field *bt_event_get_event_context(
 
        context = event->context_payload;
        bt_get(context);
+
 end:
        return context;
 }
 
-int bt_event_set_event_context(struct bt_event *event,
-               struct bt_field *context)
+int bt_event_set_event_context(struct bt_event *event, struct bt_field *context)
 {
-       int ret = 0;
-       struct bt_field_type *field_type = NULL;
-
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               ret = -1;
-               goto end;
-       }
-
-       if (event->frozen) {
-               BT_LOGW("Invalid parameter: event is frozen: addr=%p, "
-                       "event-class-name=\"%s\", event-class-id=%" PRId64,
-                       event, bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class));
-               ret = -1;
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_EVENT_HOT(event, "Event");
 
        if (context) {
-               field_type = bt_field_get_type(context);
-
-               if (bt_field_type_compare(field_type,
-                               event->event_class->context)) {
-                       BT_LOGW("Invalid parameter: context field type is different from the expected field type: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64,
-                               event,
-                               bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class));
-                       ret = -1;
-                       goto end;
-               }
+               BT_ASSERT_PRE(bt_field_type_compare(context->type,
+                       event->event_class->context) == 0,
+                       "Context field's type is different from the "
+                       "expected field type: %![event-]+e, %![ft-]+F, "
+                       "%![expected-ft-]+F",
+                       event, context->type, event->event_class->context);
        } else {
-               if (event->event_class->context) {
-                       BT_LOGW("Invalid parameter: setting no event context but event context field type is not NULL: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64 ", "
-                               "event-context-ft-addr=%p",
-                               event,
-                               bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class),
-                               event->event_class->context);
-                       ret = -1;
-                       goto end;
-               }
+               BT_ASSERT_PRE(!event->event_class->context,
+                       "Setting no event context field, "
+                       "but event context field type is not NULL: ",
+                       "%![event-]+e, %![context-ft-]+F",
+                       event, event->event_class->context);
        }
 
        bt_put(event->context_payload);
@@ -684,9 +569,7 @@ int bt_event_set_event_context(struct bt_event *event,
                "context-field-addr=%p",
                event, bt_event_class_get_name(event->event_class),
                bt_event_class_get_id(event->event_class), context);
-end:
-       bt_put(field_type);
-       return ret;
+       return 0;
 }
 
 struct bt_field *bt_event_get_stream_event_context(
@@ -694,10 +577,7 @@ struct bt_field *bt_event_get_stream_event_context(
 {
        struct bt_field *stream_event_context = NULL;
 
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
 
        if (!event->stream_event_context) {
                BT_LOGV("Event has no current stream event context field: addr=%p, "
@@ -708,6 +588,7 @@ struct bt_field *bt_event_get_stream_event_context(
        }
 
        stream_event_context = event->stream_event_context;
+
 end:
        return bt_get(stream_event_context);
 }
@@ -715,58 +596,24 @@ end:
 int bt_event_set_stream_event_context(struct bt_event *event,
                struct bt_field *stream_event_context)
 {
-       int ret = 0;
-       struct bt_field_type *field_type = NULL;
-       struct bt_stream_class *stream_class = NULL;
-
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               ret = -1;
-               goto end;
-       }
-
-       if (event->frozen) {
-               BT_LOGW("Invalid parameter: event is frozen: addr=%p, "
-                       "event-class-name=\"%s\", event-class-id=%" PRId64,
-                       event, bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class));
-               ret = -1;
-               goto end;
-       }
-
-       stream_class = bt_event_class_get_stream_class(event->event_class);
-       /*
-        * We should not have been able to create the event without associating
-        * the event class to a stream class.
-        */
-       assert(stream_class);
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_EVENT_HOT(event, "Event");
 
        if (stream_event_context) {
-               field_type = bt_field_get_type(stream_event_context);
-               if (bt_field_type_compare(field_type,
-                               stream_class->event_context_type)) {
-                       BT_LOGW("Invalid parameter: stream event context field type is different from the expected field type: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64,
-                               event,
-                               bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class));
-                       ret = -1;
-                       goto end;
-               }
+               BT_ASSERT_PRE(bt_field_type_compare(stream_event_context->type,
+                       bt_event_class_borrow_stream_class(event->event_class)->event_context_type) == 0,
+                       "Stream event context field's type is different from the "
+                       "expected field type: %![event-]+e, %![ft-]+F, "
+                       "%![expected-ft-]+F",
+                       event, stream_event_context->type,
+                       bt_event_class_borrow_stream_class(event->event_class)->event_context_type);
        } else {
-               if (stream_class->event_context_type) {
-                       BT_LOGW("Invalid parameter: setting no stream event context but stream event context field type is not NULL: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64 ", "
-                               "stream-event-context-ft-addr=%p",
-                               event,
-                               bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class),
-                               stream_class->event_context_type);
-                       ret = -1;
-                       goto end;
-               }
+               BT_ASSERT_PRE(!bt_event_class_borrow_stream_class(event->event_class)->event_context_type,
+                       "Setting no stream event context field, "
+                       "but stream event context field type is not NULL: ",
+                       "%![event-]+e, %![context-ft-]+F",
+                       event,
+                       bt_event_class_borrow_stream_class(event->event_class)->event_context_type);
        }
 
        bt_get(stream_event_context);
@@ -777,10 +624,7 @@ int bt_event_set_stream_event_context(struct bt_event *event,
                event, bt_event_class_get_name(event->event_class),
                bt_event_class_get_id(event->event_class),
                stream_event_context);
-end:
-       BT_PUT(stream_class);
-       bt_put(field_type);
-       return ret;
+       return 0;
 }
 
 /* Pre-2.0 CTF writer backward compatibility */
@@ -832,13 +676,8 @@ struct bt_clock_value *bt_event_get_clock_value(
 {
        struct bt_clock_value *clock_value = NULL;
 
-       if (!event || !clock_class) {
-               BT_LOGW("Invalid parameter: event or clock class is NULL: "
-                       "event-addr=%p, clock-class-addr=%p",
-                       event, clock_class);
-               goto end;
-       }
-
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_NON_NULL(clock_class, "Clock class");
        clock_value = g_hash_table_lookup(event->clock_values, clock_class);
        if (!clock_value) {
                BT_LOGV("No clock value associated to the given clock class: "
@@ -852,6 +691,7 @@ struct bt_clock_value *bt_event_get_clock_value(
        }
 
        bt_get(clock_value);
+
 end:
        return clock_value;
 }
@@ -859,49 +699,25 @@ end:
 int bt_event_set_clock_value(struct bt_event *event,
                struct bt_clock_value *value)
 {
-       int ret = 0;
        struct bt_trace *trace;
        struct bt_stream_class *stream_class;
        struct bt_event_class *event_class;
        struct bt_clock_class *clock_class = NULL;
 
-       if (!event || !value) {
-               BT_LOGW("Invalid parameter: event or clock value is NULL: "
-                       "event-addr=%p, clock-value-addr=%p",
-                       event, value);
-               ret = -1;
-               goto end;
-       }
-
-       if (event->frozen) {
-               BT_LOGW("Invalid parameter: event is frozen: addr=%p, "
-                       "event-class-name=\"%s\", event-class-id=%" PRId64,
-                       event, bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class));
-               ret = -1;
-               goto end;
-       }
-
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_NON_NULL(value, "Clock value");
+       BT_ASSERT_PRE_EVENT_HOT(event, "Event");
        clock_class = bt_clock_value_get_class(value);
        event_class = bt_event_borrow_event_class(event);
-       assert(event_class);
+       BT_ASSERT(event_class);
        stream_class = bt_event_class_borrow_stream_class(event_class);
-       assert(stream_class);
+       BT_ASSERT(stream_class);
        trace = bt_stream_class_borrow_trace(stream_class);
-       assert(trace);
-
-       if (!bt_trace_has_clock_class(trace, clock_class)) {
-               BT_LOGW("Invalid parameter: clock class is not part of event's trace: "
-                       "event-addr=%p, event-class-name=\"%s\", "
-                       "event-class-id=%" PRId64 ", clock-class-addr=%p, "
-                       "clock-class-name=\"%s\"",
-                       event, bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class),
-                       clock_class, bt_clock_class_get_name(clock_class));
-               ret = -1;
-               goto end;
-       }
-
+       BT_ASSERT(trace);
+       BT_ASSERT_PRE(bt_trace_has_clock_class(trace, clock_class),
+               "Clock class is not part of event's trace: "
+               "%![event-]+e, %![clock-class-]+K",
+               event, clock_class);
        g_hash_table_insert(event->clock_values, clock_class, bt_get(value));
        BT_LOGV("Set event's clock value: "
                "event-addr=%p, event-class-name=\"%s\", "
@@ -913,89 +729,79 @@ int bt_event_set_clock_value(struct bt_event *event,
                clock_class, bt_clock_class_get_name(clock_class),
                value, value->value);
        clock_class = NULL;
-
-end:
        bt_put(clock_class);
-       return ret;
+       return 0;
 }
 
 BT_HIDDEN
-int bt_event_validate(struct bt_event *event)
+int _bt_event_validate(struct bt_event *event)
 {
-       /* Make sure each field's payload has been set */
-       int ret;
-       struct bt_stream_class *stream_class = NULL;
+       int ret = 0;
+       struct bt_stream_class *stream_class;
 
-       assert(event);
+       BT_ASSERT(event);
        if (event->event_header) {
-               ret = bt_field_validate(event->event_header);
+               ret = bt_field_validate_recursive(event->event_header);
                if (ret) {
-                       BT_LOGD("Invalid event's header field: "
-                                       "event-addr=%p, event-class-name=\"%s\", "
-                                       "event-class-id=%" PRId64,
-                                       event, bt_event_class_get_name(event->event_class),
-                                       bt_event_class_get_id(event->event_class));
+                       BT_ASSERT_PRE_MSG("Invalid event's header field: "
+                               "%![event-]+e, %![field-]+f",
+                               event, event->event_header);
                        goto end;
                }
        }
 
-       stream_class = bt_event_class_get_stream_class(event->event_class);
+       stream_class = bt_event_class_borrow_stream_class(event->event_class);
+
        /*
         * We should not have been able to create the event without associating
         * the event class to a stream class.
         */
-       assert(stream_class);
+       BT_ASSERT(stream_class);
+
        if (stream_class->event_context_type) {
-               ret = bt_field_validate(event->stream_event_context);
+               ret = bt_field_validate_recursive(event->stream_event_context);
                if (ret) {
-                       BT_LOGD("Invalid event's stream event context field: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64,
-                               event,
-                               bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class));
+                       BT_ASSERT_PRE_MSG("Invalid event's stream event context field: "
+                               "%![event-]+e, %![field-]+f",
+                               event, event->stream_event_context);
                        goto end;
                }
        }
 
-       ret = bt_field_validate(event->fields_payload);
+       if (event->event_class->context) {
+               ret = bt_field_validate_recursive(event->context_payload);
+               if (ret) {
+                       BT_ASSERT_PRE_MSG("Invalid event's payload field: "
+                               "%![event-]+e, %![field-]+f",
+                               event, event->context_payload);
+                       goto end;
+               }
+       }
+
+       ret = bt_field_validate_recursive(event->fields_payload);
        if (ret) {
-               BT_LOGD("Invalid event's payload field: "
-                       "event-addr=%p, event-class-name=\"%s\", "
-                       "event-class-id=%" PRId64,
-                       event,
-                       bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class));
+               BT_ASSERT_PRE_MSG("Invalid event's payload field: "
+                       "%![event-]+e, %![field-]+f",
+                       event, event->fields_payload);
                goto end;
        }
 
-       if (event->event_class->context) {
-               BT_LOGD("Invalid event's context field: "
-                       "event-addr=%p, event-class-name=\"%s\", "
-                       "event-class-id=%" PRId64,
-                       event,
-                       bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class));
-               ret = bt_field_validate(event->context_payload);
-       }
 end:
-       bt_put(stream_class);
        return ret;
 }
 
 BT_HIDDEN
-int bt_event_serialize(struct bt_event *event,
-               struct bt_stream_pos *pos,
+int bt_event_serialize(struct bt_event *event, struct bt_stream_pos *pos,
                enum bt_byte_order native_byte_order)
 {
        int ret = 0;
 
-       assert(event);
-       assert(pos);
+       BT_ASSERT(event);
+       BT_ASSERT(pos);
 
        BT_LOGV_STR("Serializing event's context field.");
        if (event->context_payload) {
-               ret = bt_field_serialize(event->context_payload, pos,
+               ret = bt_field_serialize_recursive(event->context_payload, pos,
                        native_byte_order);
                if (ret) {
                        BT_LOGW("Cannot serialize event's context field: "
@@ -1010,7 +816,7 @@ int bt_event_serialize(struct bt_event *event,
 
        BT_LOGV_STR("Serializing event's payload field.");
        if (event->fields_payload) {
-               ret = bt_field_serialize(event->fields_payload, pos,
+               ret = bt_field_serialize_recursive(event->fields_payload, pos,
                        native_byte_order);
                if (ret) {
                        BT_LOGW("Cannot serialize event's payload field: "
@@ -1030,11 +836,7 @@ struct bt_packet *bt_event_get_packet(struct bt_event *event)
 {
        struct bt_packet *packet = NULL;
 
-       if (!event) {
-               BT_LOGW_STR("Invalid parameter: event is NULL.");
-               goto end;
-       }
-
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
        if (!event->packet) {
                BT_LOGV("Event has no current packet: addr=%p, "
                        "event-class-name=\"%s\", event-class-id=%" PRId64,
@@ -1044,6 +846,7 @@ struct bt_packet *bt_event_get_packet(struct bt_event *event)
        }
 
        packet = bt_get(event->packet);
+
 end:
        return packet;
 }
@@ -1051,65 +854,25 @@ end:
 int bt_event_set_packet(struct bt_event *event,
                struct bt_packet *packet)
 {
-       struct bt_stream_class *event_stream_class = NULL;
-       struct bt_stream_class *packet_stream_class = NULL;
-       struct bt_stream *stream = NULL;
-       int ret = 0;
-
-       if (!event || !packet) {
-               BT_LOGW("Invalid parameter: event or packet is NULL: "
-                       "event-addr=%p, packet-addr=%p",
-                       event, packet);
-               ret = -1;
-               goto end;
-       }
-
-       if (event->frozen) {
-               BT_LOGW("Invalid parameter: event is frozen: addr=%p, "
-                       "event-class-name=\"%s\", event-class-id=%" PRId64,
-                       event, bt_event_class_get_name(event->event_class),
-                       bt_event_class_get_id(event->event_class));
-               ret = -1;
-               goto end;
-       }
+       BT_ASSERT_PRE_NON_NULL(event, "Event");
+       BT_ASSERT_PRE_NON_NULL(packet, "Packet");
+       BT_ASSERT_PRE_EVENT_HOT(event, "Event");
 
        /*
         * Make sure the new packet was created by this event's
         * stream, if it is set.
         */
-       stream = bt_event_get_stream(event);
-       if (stream) {
-               if (packet->stream != stream) {
-                       BT_LOGW("Invalid parameter: packet's stream and event's stream differ: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64 ", packet-stream-addr=%p, "
-                               "event-stream-addr=%p",
-                               event, bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class),
-                               packet->stream, stream);
-                       ret = -1;
-                       goto end;
-               }
+       if (bt_event_borrow_stream(event)) {
+               BT_ASSERT_PRE(packet->stream == bt_event_borrow_stream(event),
+                       "Packet's stream and event's stream differ: "
+                       "%![event-]+e, %![packet-]+a",
+                       event, packet);
        } else {
-               event_stream_class =
-                       bt_event_class_get_stream_class(event->event_class);
-               packet_stream_class =
-                       bt_stream_get_class(packet->stream);
-
-               assert(event_stream_class);
-               assert(packet_stream_class);
-
-               if (event_stream_class != packet_stream_class) {
-                       BT_LOGW("Invalid parameter: packet's stream class and event's stream class differ: "
-                               "event-addr=%p, event-class-name=\"%s\", "
-                               "event-class-id=%" PRId64 ", packet-stream-class-addr=%p, "
-                               "event-stream-class-addr=%p",
-                               event, bt_event_class_get_name(event->event_class),
-                               bt_event_class_get_id(event->event_class),
-                               packet_stream_class, event_stream_class);
-                       ret = -1;
-                       goto end;
-               }
+               BT_ASSERT_PRE(bt_event_class_borrow_stream_class(event->event_class) ==
+                       packet->stream->stream_class,
+                       "Packet's stream class and event's stream class differ: "
+                       "%![event-]+e, %![packet-]+a",
+                       event, packet);
        }
 
        bt_get(packet);
@@ -1119,19 +882,13 @@ int bt_event_set_packet(struct bt_event *event,
                "packet-addr=%p",
                event, bt_event_class_get_name(event->event_class),
                bt_event_class_get_id(event->event_class), packet);
-
-end:
-       BT_PUT(stream);
-       BT_PUT(event_stream_class);
-       BT_PUT(packet_stream_class);
-
-       return ret;
+       return 0;
 }
 
 BT_HIDDEN
-void bt_event_freeze(struct bt_event *event)
+void _bt_event_freeze(struct bt_event *event)
 {
-       assert(event);
+       BT_ASSERT(event);
 
        if (event->frozen) {
                return;
@@ -1143,12 +900,12 @@ void bt_event_freeze(struct bt_event *event)
                bt_event_class_get_id(event->event_class));
        bt_packet_freeze(event->packet);
        BT_LOGD_STR("Freezing event's header field.");
-       bt_field_freeze(event->event_header);
+       bt_field_freeze_recursive(event->event_header);
        BT_LOGD_STR("Freezing event's stream event context field.");
-       bt_field_freeze(event->stream_event_context);
+       bt_field_freeze_recursive(event->stream_event_context);
        BT_LOGD_STR("Freezing event's context field.");
-       bt_field_freeze(event->context_payload);
+       bt_field_freeze_recursive(event->context_payload);
        BT_LOGD_STR("Freezing event's payload field.");
-       bt_field_freeze(event->fields_payload);
+       bt_field_freeze_recursive(event->fields_payload);
        event->frozen = 1;
 }
This page took 0.035415 seconds and 4 git commands to generate.