Unify reference counting using a common bt_object base

[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 aaf2ea88b650b81687066a27cd6291397c140e68..17695f92bee84a8a18afbb4afd861a4bfd8890cf 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -27,20 +27,27 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-writer/ref-internal.h>
 #include <babeltrace/ctf-writer/event-types.h>
 #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/object-internal.h>
 #include <glib.h>
 
+#define BT_CTF_EVENT_CLASS_ATTR_ID_INDEX       0
+#define BT_CTF_EVENT_CLASS_ATTR_NAME_INDEX     1
+
 struct bt_ctf_event_class {
-       struct bt_ctf_ref ref_count;
-       GQuark name;
-       int id_set;
-       uint32_t id;
-       int stream_id_set;
-       uint32_t stream_id;
+       struct bt_object base;
+       struct bt_value *attributes;
+       /*
+        * Weak reference; an event class does not have ownership of a
+        * stream class.
+        */
+       struct bt_ctf_stream_class *stream_class;
        /* Structure type containing the event's context */
        struct bt_ctf_field_type *context;
        /* Structure type containing the event's fields */
@@ -49,9 +56,11 @@ struct bt_ctf_event_class {
 };
 
 struct bt_ctf_event {
-       struct bt_ctf_ref ref_count;
-       uint64_t timestamp;
+       struct bt_object base;
        struct bt_ctf_event_class *event_class;
+       /* Weak reference; an event does not have ownership of a stream */
+       struct bt_ctf_stream *stream;
+       struct bt_ctf_field *event_header;
        struct bt_ctf_field *context_payload;
        struct bt_ctf_field *fields_payload;
 };
@@ -60,19 +69,21 @@ BT_HIDDEN
 void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class);
 
 BT_HIDDEN
-int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
-               uint32_t id);
+int bt_ctf_event_class_set_stream_class(struct bt_ctf_event_class *event_class,
+               struct bt_ctf_stream_class *stream_class);
 
 BT_HIDDEN
-uint32_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class);
+int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
+               struct metadata_context *context);
 
 BT_HIDDEN
-int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
-               uint32_t id);
+void bt_ctf_event_class_set_native_byte_order(
+               struct bt_ctf_event_class *event_class,
+               int byte_order);
 
 BT_HIDDEN
-int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
-               struct metadata_context *context);
+int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
+               uint32_t stream_id);
 
 BT_HIDDEN
 int bt_ctf_event_validate(struct bt_ctf_event *event);
@@ -82,9 +93,19 @@ int bt_ctf_event_serialize(struct bt_ctf_event *event,
                struct ctf_stream_pos *pos);
 
 BT_HIDDEN
-int bt_ctf_event_set_timestamp(struct bt_ctf_event *event, uint64_t timestamp);
+int bt_ctf_event_set_stream(struct bt_ctf_event *event,
+               struct bt_ctf_stream *stream);
 
+/*
+ * 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
-uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event);
+int bt_ctf_event_populate_event_header(struct bt_ctf_event *event);
 
 #endif /* BABELTRACE_CTF_IR_EVENT_INTERNAL_H */