X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=13232692b6be62720bd918b75c7873f28dac5264;hp=1ba00a67232d59f5fb76bac2a07d8daea2e01984;hb=a35173fe7e72fe456cbd19db34a5ff7a09a0c7ff;hpb=81dee1bb528a95f7bf2bc622948807150794a75e

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 1ba00a67..13232692 100644
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -93,7 +93,6 @@ int ctf_read_event(struct stream_pos *ppos, 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;
 
 	if (pos->offset == EOF)
@@ -101,38 +100,43 @@ 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;
+
 		ret = generic_rw(ppos, &stream_class->event_header->p);
 		if (ret)
 			goto error;
 		/* 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;
+		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;
 
-			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 */
+			enum_definition = lookup_enum(&stream_class->event_header->p, "id", FALSE);
+			if (enum_definition) {
+				id = enum_definition->integer->value._unsigned;
+			}
 		}
 
 		/* lookup timestamp */
-		len_index = struct_declaration_lookup_field_index(stream_class->event_header_decl,
-				g_quark_from_static_string("timestamp"));
-		if (len_index >= 0) {
-			struct definition_integer *defint;
-			struct definition *field;
+		integer_definition = lookup_integer(&stream_class->event_header->p, "timestamp", FALSE);
+		if (integer_definition) {
+			stream->timestamp = integer_definition->value._unsigned;
+		} else {
+			struct definition *definition;
 
-			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);
-			/* update timestamp */
-			stream->timestamp = defint->value._unsigned;
+			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 (integer_definition) {
+					stream->timestamp = integer_definition->value._unsigned;
+				}
+			}
 		}
-
 	}
 
 	/* Read stream-declared event context */