X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fctf-ir%2Fevent-internal.h;h=f381be8d9c49626325cf21221afabdf849a3ec89;hb=5fd2e9fda6185e989583e6e61b9312683149747e;hp=5d02b11f018a659b239d9b2d005b4458b09bbf29;hpb=adc315b840e3970b9f6e255c91e38ec29f05adab;p=babeltrace.git

diff --git a/include/babeltrace/ctf-ir/event-internal.h b/include/babeltrace/ctf-ir/event-internal.h
index 5d02b11f..f381be8d 100644
--- a/include/babeltrace/ctf-ir/event-internal.h
+++ b/include/babeltrace/ctf-ir/event-internal.h
@@ -2,9 +2,9 @@
 #define BABELTRACE_CTF_IR_EVENT_INTERNAL_H
 
 /*
- * BabelTrace - CTF IR: Event internal
+ * Babeltrace - CTF IR: Event internal
  *
- * Copyright 2013 EfficiOS Inc.
+ * Copyright 2013, 2014 Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
  * Author: Jérémie Galarneau <jeremie.galarneau@efficios.com>
  *
@@ -27,53 +27,25 @@
  * 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/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;
-	int stream_id_set;
-	uint32_t stream_id;
-	/* 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_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_id(struct bt_ctf_event_class *event_class,
-		uint32_t id);
-
-BT_HIDDEN
-uint32_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class);
-
-BT_HIDDEN
-int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
-		uint32_t id);
-
-BT_HIDDEN
-int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
-		struct metadata_context *context);
-
 BT_HIDDEN
 int bt_ctf_event_validate(struct bt_ctf_event *event);
 
@@ -81,10 +53,16 @@ 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_set_timestamp(struct bt_ctf_event *event, uint64_t timestamp);
-
-BT_HIDDEN
-uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event);
+int bt_ctf_event_populate_event_header(struct bt_ctf_event *event);
 
 #endif /* BABELTRACE_CTF_IR_EVENT_INTERNAL_H */