X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=730e2a3ae1fee0a7613475d38e1bedd22d0649a3;hp=e84e19d870e0d5bd1531e8cdb9266effa2d6806b;hb=ccdb988e746c6c074b4fe884f9c6da44f27a2dcb;hpb=bcdf4cf28bb5517137c074801b949fc641141e6c

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index e84e19d8..730e2a3a 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -101,6 +101,7 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 	/* Read event header */
 	if (stream_class->event_header) {
 		struct definition_integer *integer_definition;
+		struct definition *variant;
 
 		ret = generic_rw(ppos, &stream_class->event_header->p);
 		if (ret)
@@ -118,20 +119,21 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 			}
 		}
 
+		variant = lookup_variant(&stream_class->event_header->p, "v");
+		if (variant) {
+			integer_definition = lookup_integer(variant, "id", FALSE);
+			if (integer_definition) {
+				id = integer_definition->value._unsigned;
+			}
+		}
+
 		/* lookup timestamp */
 		integer_definition = lookup_integer(&stream_class->event_header->p, "timestamp", FALSE);
 		if (integer_definition) {
 			stream->timestamp = integer_definition->value._unsigned;
 		} else {
-			struct definition *definition;
-
-			definition = lookup_variant(&stream_class->event_header->p, "v");
-			if (definition) {
-				integer_definition = lookup_integer(definition, "id", FALSE);
-				if (integer_definition) {
-					id = integer_definition->value._unsigned;
-				}
-				integer_definition = lookup_integer(definition, "timestamp", FALSE);
+			if (variant) {
+				integer_definition = lookup_integer(variant, "timestamp", FALSE);
 				if (integer_definition) {
 					stream->timestamp = integer_definition->value._unsigned;
 				}
@@ -183,23 +185,32 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
 	struct ctf_stream_class *stream_class = stream->stream_class;
 	struct ctf_event *event_class;
 	uint64_t id = 0;
-	int len_index;
 	int ret;
 
 	/* print event header */
 	if (stream_class->event_header) {
+		struct definition_integer *integer_definition;
+		struct definition *variant;
+
 		/* lookup event id */
-		len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
-				g_quark_from_static_string("id"));
-		if (len_index >= 0) {
-			struct definition_integer *defint;
-			struct definition *field;
-
-			field = struct_definition_get_field_from_index(stream_class->event_header, len_index);
-			assert(field->declaration->id == CTF_TYPE_INTEGER);
-			defint = container_of(field, struct definition_integer, p);
-			assert(defint->declaration->signedness == FALSE);
-			id = defint->value._unsigned;	/* set id */
+		integer_definition = lookup_integer(&stream_class->event_header->p, "id", FALSE);
+		if (integer_definition) {
+			id = integer_definition->value._unsigned;
+		} else {
+			struct definition_enum *enum_definition;
+
+			enum_definition = lookup_enum(&stream_class->event_header->p, "id", FALSE);
+			if (enum_definition) {
+				id = enum_definition->integer->value._unsigned;
+			}
+		}
+
+		variant = lookup_variant(&stream_class->event_header->p, "v");
+		if (variant) {
+			integer_definition = lookup_integer(variant, "id", FALSE);
+			if (integer_definition) {
+				id = integer_definition->value._unsigned;
+			}
 		}
 
 		ret = generic_rw(pos, &stream_class->event_header->p);