ir: refactor FT validation and resolving

[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 db98771f45e91f4d35774c00bae39da79e1a8747..43a12ba52d64fd22782ec2b1e9ca456d0f567884 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -34,32 +34,33 @@
 #include <babeltrace/ctf/types.h>
 #include <babeltrace/ctf-ir/stream-class.h>
 #include <babeltrace/ctf-ir/stream.h>
-#include <babeltrace/ctf-ir/common-internal.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_base base;
+       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 */
        struct bt_ctf_field_type *fields;
        int frozen;
+
+       /*
+        * This flag indicates if the event class is valid. A valid
+        * event class is _always_ frozen. However, an event class
+        * may be frozen, but not valid yet. This is okay, as long as
+        * no events are created out of this event class.
+        */
+       int valid;
 };
 
 struct bt_ctf_event {
-       struct bt_ctf_base base;
+       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;
@@ -68,10 +69,6 @@ struct bt_ctf_event {
 BT_HIDDEN
 void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class);
 
-BT_HIDDEN
-int bt_ctf_event_class_set_stream_class(struct bt_ctf_event_class *event_class,
-               struct bt_ctf_stream_class *stream_class);
-
 BT_HIDDEN
 int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
                struct metadata_context *context);
@@ -92,10 +89,6 @@ BT_HIDDEN
 int bt_ctf_event_serialize(struct bt_ctf_event *event,
                struct ctf_stream_pos *pos);
 
-BT_HIDDEN
-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.