X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fevent-internal.h;h=85fea18cd4817c5ae70127e0fe8cf4ef2ae0b43d;hb=dc3fffef7b84cc4af1a7c99828fd57a106cd2257;hp=ed09e962bf9bca9a3536c0c8ae3392dce129a7a7;hpb=c44c3e709f9e95a847e9502c5297234aa1f01577;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index ed09e962..85fea18c 100644
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -31,13 +31,15 @@
 #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_stream_pos;
+
 struct bt_ctf_event {
 	struct bt_object base;
 	struct bt_ctf_event_class *event_class;
@@ -46,7 +48,8 @@ struct bt_ctf_event {
 	struct bt_ctf_field *stream_event_context;
 	struct bt_ctf_field *context_payload;
 	struct bt_ctf_field *fields_payload;
-	GHashTable *clock_values; /* Maps clock addresses to (uint64_t *) */
+	/* Maps clock classes to bt_ctf_clock_value. */
+	GHashTable *clock_values;
 	int frozen;
 };
 
@@ -55,21 +58,18 @@ int bt_ctf_event_validate(struct bt_ctf_event *event);
 
 BT_HIDDEN
 int bt_ctf_event_serialize(struct bt_ctf_event *event,
-		struct ctf_stream_pos *pos);
-
-/*
- * 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);
+		struct bt_ctf_stream_pos *pos,
+		enum bt_ctf_byte_order native_byte_order);
 
 BT_HIDDEN
 void bt_ctf_event_freeze(struct bt_ctf_event *event);
 
+static inline
+struct bt_ctf_event_class *bt_ctf_event_borrow_event_class(
+		struct bt_ctf_event *event)
+{
+	assert(event);
+	return event->event_class;
+}
+
 #endif /* BABELTRACE_CTF_IR_EVENT_INTERNAL_H */