Enum printing fix, enum / variant header handling

[babeltrace.git] / formats / ctf / ctf.c

diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c
index 13c87eae176651fe97b1fd0c25d3871e5f02f6a4..730e2a3ae1fee0a7613475d38e1bedd22d0649a3 100644 (file)
--- a/formats/ctf/ctf.c
+++ b/formats/ctf/ctf.c
@@ -63,8 +63,8 @@ rw_dispatch read_dispatch_table[] = {
        [ CTF_TYPE_STRING ] = ctf_string_read,
        [ CTF_TYPE_STRUCT ] = ctf_struct_rw,
        [ CTF_TYPE_VARIANT ] = ctf_variant_rw,
-       [ CTF_TYPE_ARRAY ] = ctf_array_rw,
-       [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw,
+       [ CTF_TYPE_ARRAY ] = ctf_array_read,
+       [ CTF_TYPE_SEQUENCE ] = ctf_sequence_read,
 };
 
 static
@@ -75,8 +75,8 @@ rw_dispatch write_dispatch_table[] = {
        [ CTF_TYPE_STRING ] = ctf_string_write,
        [ CTF_TYPE_STRUCT ] = ctf_struct_rw,
        [ CTF_TYPE_VARIANT ] = ctf_variant_rw,
-       [ CTF_TYPE_ARRAY ] = ctf_array_rw,
-       [ CTF_TYPE_SEQUENCE ] = ctf_sequence_rw,
+       [ CTF_TYPE_ARRAY ] = ctf_array_write,
+       [ CTF_TYPE_SEQUENCE ] = ctf_sequence_write,
 };
 
 static
@@ -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,45 @@ 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)
                        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;
-
-                       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;
+                       }
                }
 
-               /* 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;
-
-                       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;
+               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 {
+                       if (variant) {
+                               integer_definition = lookup_integer(variant, "timestamp", FALSE);
+                               if (integer_definition) {
+                                       stream->timestamp = integer_definition->value._unsigned;
+                               }
+                       }
+               }
        }
 
        /* Read stream-declared event context */
@@ -179,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);
@@ -453,7 +468,11 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                        ret = -EINVAL;
                        break;
                }
-               printf("read %s\n", buf);
+               if (babeltrace_debug) {
+                       fprintf(stdout, "[debug] metadata packet read: %s\n",
+                               buf);
+               }
+
                writelen = fwrite(buf, sizeof(char), readlen, out);
                if (writelen < readlen) {
                        ret = -EIO;
@@ -481,6 +500,11 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
        int ret;
 
        in = *fp;
+       /*
+        * Using strlen on *buf instead of size of open_memstream
+        * because its size includes garbage at the end (after final
+        * \0). This is the allocated size, not the actual string size.
+        */
        out = open_memstream(buf, &size);
        if (out == NULL)
                return -errno;
@@ -498,7 +522,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp,
        fclose(out);    /* flush the buffer */
        fclose(in);
        /* open for reading */
-       *fp = fmemopen(*buf, size, "rb");
+       *fp = fmemopen(*buf, strlen(*buf), "rb");
        return 0;
 }