ir: move the stream event ctx field to the event

[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 17695f92bee84a8a18afbb4afd861a4bfd8890cf..f381be8d9c49626325cf21221afabdf849a3ec89 100644 (file)
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -2,7 +2,7 @@
 #define BABELTRACE_CTF_IR_EVENT_INTERNAL_H
 
 /*
- * BabelTrace - CTF IR: Event internal
+ * Babeltrace - CTF IR: Event internal
  *
  * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -37,54 +37,15 @@
 #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_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;
-};
-
 struct bt_ctf_event {
        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 *stream_event_context;
        struct bt_ctf_field *context_payload;
        struct bt_ctf_field *fields_payload;
 };
 
-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);
-
-BT_HIDDEN
-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_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);
 
@@ -92,10 +53,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.