tap-driver.sh: flush stdout after each test result

[babeltrace.git] / lib / trace-ir / event-class.c

diff --git a/lib/trace-ir/event-class.c b/lib/trace-ir/event-class.c
index b15ee7ad2163ab39b55fefc39e2eb7d79144c229..db3911a083b6dd06adfc3af5bd50f1ce8e6ffb59 100644 (file)
--- a/lib/trace-ir/event-class.c
+++ b/lib/trace-ir/event-class.c
@@ -22,28 +22,28 @@
  */
 
 #define BT_LOG_TAG "EVENT-CLASS"
-#include <babeltrace/lib-logging-internal.h>
-
-#include <babeltrace/assert-pre-internal.h>
-#include <babeltrace/trace-ir/clock-snapshot-internal.h>
-#include <babeltrace/trace-ir/field-internal.h>
-#include <babeltrace/trace-ir/field-class.h>
-#include <babeltrace/trace-ir/field-class-internal.h>
-#include <babeltrace/trace-ir/event-class.h>
-#include <babeltrace/trace-ir/event-class-const.h>
-#include <babeltrace/trace-ir/event-class-internal.h>
-#include <babeltrace/trace-ir/event-internal.h>
-#include <babeltrace/trace-ir/stream-class.h>
-#include <babeltrace/trace-ir/stream-class-internal.h>
-#include <babeltrace/trace-ir/trace-internal.h>
-#include <babeltrace/trace-ir/utils-internal.h>
-#include <babeltrace/trace-ir/resolve-field-path-internal.h>
-#include <babeltrace/trace-ir/attributes-internal.h>
-#include <babeltrace/compiler-internal.h>
-#include <babeltrace/endian-internal.h>
-#include <babeltrace/types.h>
-#include <babeltrace/value-internal.h>
-#include <babeltrace/assert-internal.h>
+#include <babeltrace2/lib-logging-internal.h>
+
+#include <babeltrace2/assert-pre-internal.h>
+#include <babeltrace2/trace-ir/clock-snapshot-internal.h>
+#include <babeltrace2/trace-ir/field-internal.h>
+#include <babeltrace2/trace-ir/field-class.h>
+#include <babeltrace2/trace-ir/field-class-internal.h>
+#include <babeltrace2/trace-ir/event-class.h>
+#include <babeltrace2/trace-ir/event-class-const.h>
+#include <babeltrace2/trace-ir/event-class-internal.h>
+#include <babeltrace2/trace-ir/event-internal.h>
+#include <babeltrace2/trace-ir/stream-class.h>
+#include <babeltrace2/trace-ir/stream-class-internal.h>
+#include <babeltrace2/trace-ir/trace-internal.h>
+#include <babeltrace2/trace-ir/utils-internal.h>
+#include <babeltrace2/trace-ir/resolve-field-path-internal.h>
+#include <babeltrace2/trace-ir/attributes-internal.h>
+#include <babeltrace2/compiler-internal.h>
+#include <babeltrace2/endian-internal.h>
+#include <babeltrace2/types.h>
+#include <babeltrace2/value-internal.h>
+#include <babeltrace2/assert-internal.h>
 #include <inttypes.h>
 #include <stdlib.h>
 
@@ -273,17 +273,22 @@ bt_event_class_borrow_specific_context_field_class_const(
        return event_class->specific_context_fc;
 }
 
+struct bt_field_class *
+bt_event_class_borrow_specific_context_field_class(
+               struct bt_event_class *event_class)
+{
+       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       return event_class->specific_context_fc;
+}
+
 enum bt_event_class_status bt_event_class_set_specific_context_field_class(
                struct bt_event_class *event_class,
                struct bt_field_class *field_class)
 {
        int ret;
        struct bt_stream_class *stream_class;
-       struct bt_trace_class *trace_class;
        struct bt_resolve_field_path_context resolve_ctx = {
-               .packet_header = NULL,
                .packet_context = NULL,
-               .event_header = NULL,
                .event_common_context = NULL,
                .event_specific_context = field_class,
                .event_payload = NULL,
@@ -298,10 +303,7 @@ enum bt_event_class_status bt_event_class_set_specific_context_field_class(
                "%!+F", field_class);
        stream_class = bt_event_class_borrow_stream_class_inline(
                event_class);
-       trace_class = bt_stream_class_borrow_trace_class_inline(stream_class);
-       resolve_ctx.packet_header = trace_class->packet_header_fc;
        resolve_ctx.packet_context = stream_class->packet_context_fc;
-       resolve_ctx.event_header = stream_class->event_header_fc;
        resolve_ctx.event_common_context =
                stream_class->event_common_context_fc;
 
@@ -335,17 +337,21 @@ const struct bt_field_class *bt_event_class_borrow_payload_field_class_const(
        return event_class->payload_fc;
 }
 
+struct bt_field_class *bt_event_class_borrow_payload_field_class(
+               struct bt_event_class *event_class)
+{
+       BT_ASSERT_PRE_NON_NULL(event_class, "Event class");
+       return event_class->payload_fc;
+}
+
 enum bt_event_class_status bt_event_class_set_payload_field_class(
                struct bt_event_class *event_class,
                struct bt_field_class *field_class)
 {
        int ret;
        struct bt_stream_class *stream_class;
-       struct bt_trace_class *trace_class;
        struct bt_resolve_field_path_context resolve_ctx = {
-               .packet_header = NULL,
                .packet_context = NULL,
-               .event_header = NULL,
                .event_common_context = NULL,
                .event_specific_context = NULL,
                .event_payload = field_class,
@@ -360,10 +366,7 @@ enum bt_event_class_status bt_event_class_set_payload_field_class(
                field_class);
        stream_class = bt_event_class_borrow_stream_class_inline(
                event_class);
-       trace_class = bt_stream_class_borrow_trace_class_inline(stream_class);
-       resolve_ctx.packet_header = trace_class->packet_header_fc;
        resolve_ctx.packet_context = stream_class->packet_context_fc;
-       resolve_ctx.event_header = stream_class->event_header_fc;
        resolve_ctx.event_common_context =
                stream_class->event_common_context_fc;
        resolve_ctx.event_specific_context = event_class->specific_context_fc;