Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer

[babeltrace.git] / include / babeltrace / ctf-ir / event-internal.h

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index f381be8d9c49626325cf21221afabdf849a3ec89..b15af1107ead8b12aadfb575e053bcd7863d73c3 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -31,38 +31,52 @@
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/values.h>
-#include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/ctf-ir/stream.h>
+#include <babeltrace/ctf-ir/packet.h>
 #include <babeltrace/object-internal.h>
+#include <assert.h>
 #include <glib.h>
 
-struct bt_ctf_event {
+struct bt_stream_pos;
+
+struct bt_event {
        struct bt_object base;
-       struct bt_ctf_event_class *event_class;
-       struct bt_ctf_field *event_header;
-       struct bt_ctf_field *stream_event_context;
-       struct bt_ctf_field *context_payload;
-       struct bt_ctf_field *fields_payload;
+       struct bt_event_class *event_class;
+       struct bt_packet *packet;
+       struct bt_field *event_header;
+       struct bt_field *stream_event_context;
+       struct bt_field *context_payload;
+       struct bt_field *fields_payload;
+       /* Maps clock classes to bt_clock_value. */
+       GHashTable *clock_values;
+       int frozen;
 };
 
 BT_HIDDEN
-int bt_ctf_event_validate(struct bt_ctf_event *event);
+int bt_event_validate(struct bt_event *event);
 
 BT_HIDDEN
-int bt_ctf_event_serialize(struct bt_ctf_event *event,
-               struct ctf_stream_pos *pos);
+int bt_event_serialize(struct bt_event *event,
+               struct bt_stream_pos *pos,
+               enum bt_byte_order native_byte_order);
 
-/*
- * Attempt to populate the "id" and "timestamp" fields of the event header if
- * they are present, unset and their types are integers.
- *
- * Not finding these fields or encountering unexpected types is not an error
- * since the user may have defined a different event header layout. In this
- * case, it is expected that the fields be manually populated before appending
- * an event to a stream.
- */
 BT_HIDDEN
-int bt_ctf_event_populate_event_header(struct bt_ctf_event *event);
+void bt_event_freeze(struct bt_event *event);
+
+static inline struct bt_packet *bt_event_borrow_packet(
+               struct bt_event *event)
+{
+       assert(event);
+       return event->packet;
+}
+
+static inline
+struct bt_event_class *bt_event_borrow_event_class(
+               struct bt_event *event)
+{
+       assert(event);
+       return event->event_class;
+}
 
 #endif /* BABELTRACE_CTF_IR_EVENT_INTERNAL_H */