X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fevent-internal.h;h=2e5175cbb06ca56104ed1566c961fd7e2cc2658c;hb=1556a1afe8d70a3a89155ff25815e203333a93e9;hp=b3e05c773c01169b6e9762b1b1fa6cf984357b68;hpb=662e778c1c251b8ab256f572913b12b819679d32;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index b3e05c77..2e5175cb 100644
--- 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>
  *
@@ -27,52 +27,30 @@
  * 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/ctf-ir/packet.h>
+#include <babeltrace/object-internal.h>
 #include <glib.h>
 
-struct bt_ctf_event_class {
-	struct bt_ctf_ref ref_count;
-	GQuark name;
-	int id_set;
-	uint32_t id;
-	/* 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_ctf_ref ref_count;
-	uint64_t timestamp;
+	struct bt_object base;
 	struct bt_ctf_event_class *event_class;
+	struct bt_ctf_packet *packet;
 	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;
+	/* Maps clock classes to bt_ctf_clock_value. */
+	GHashTable *clock_values;
+	int frozen;
 };
 
-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_validate(struct bt_ctf_event *event);
 
@@ -80,12 +58,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_timestamp(struct bt_ctf_event *event, uint64_t timestamp);
-
-BT_HIDDEN
-uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event);
-
 /*
  * Attempt to populate the "id" and "timestamp" fields of the event header if
  * they are present, unset and their types are integers.
@@ -98,4 +70,7 @@ uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event);
 BT_HIDDEN
 int bt_ctf_event_populate_event_header(struct bt_ctf_event *event);
 
+BT_HIDDEN
+void bt_ctf_event_freeze(struct bt_ctf_event *event);
+
 #endif /* BABELTRACE_CTF_IR_EVENT_INTERNAL_H */