X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fevent-internal.h;h=b15af1107ead8b12aadfb575e053bcd7863d73c3;hb=50842bdc4c21f3de2b63e29cdac730af8b6dcca6;hp=5c712863a0bfc8c0f6cbcc4882fb7a2b3aa7432b;hpb=9f476966aa40bd0de2cd0654623ea03f8a3254eb;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index 5c712863..b15af110 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,70 +27,56 @@
  * 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/ctf/types.h>
+#include <babeltrace/values.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_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_stream_pos;
 
-struct bt_ctf_event {
-	struct bt_ctf_ref ref_count;
-	uint64_t timestamp;
-	struct bt_ctf_event_class *event_class;
-	struct bt_ctf_field *event_header;
-	struct bt_ctf_field *context_payload;
-	struct bt_ctf_field *fields_payload;
+struct bt_event {
+	struct bt_object base;
+	struct bt_event_class *event_class;
+	struct bt_packet *packet;
+	struct bt_field *event_header;
+	struct bt_field *stream_event_context;
+	struct bt_field *context_payload;
+	struct bt_field *fields_payload;
+	/* Maps clock classes to bt_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);
+int bt_event_validate(struct bt_event *event);
 
 BT_HIDDEN
-int bt_ctf_event_validate(struct bt_ctf_event *event);
+int bt_event_serialize(struct bt_event *event,
+		struct bt_stream_pos *pos,
+		enum bt_byte_order native_byte_order);
 
 BT_HIDDEN
-int bt_ctf_event_serialize(struct bt_ctf_event *event,
-		struct ctf_stream_pos *pos);
+void bt_event_freeze(struct bt_event *event);
 
-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);
+static inline struct bt_packet *bt_event_borrow_packet(
+		struct bt_event *event)
+{
+	assert(event);
+	return event->packet;
+}
 
-/*
- * 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);
+static inline
+struct bt_event_class *bt_event_borrow_event_class(
+		struct bt_event *event)
+{
+	assert(event);
+	return event->event_class;
+}
 
 #endif /* BABELTRACE_CTF_IR_EVENT_INTERNAL_H */