Rename struct ctf_file_event to struct ctf_stream_event
[babeltrace.git] / formats / ctf / ctf.c
index 13232692b6be62720bd918b75c7873f28dac5264..b02ef2a23b62949c91f0629e36dce2dc2e0cc7cb 100644 (file)
@@ -52,7 +52,9 @@
 
 extern int yydebug;
 
+static
 struct trace_descriptor *ctf_open_trace(const char *path, int flags);
+static
 void ctf_close_trace(struct trace_descriptor *descriptor);
 
 static
@@ -85,13 +87,39 @@ struct format ctf_format = {
        .close_trace = ctf_close_trace,
 };
 
+static
+void ctf_update_timestamp(struct ctf_stream *stream,
+                         struct definition_integer *integer_definition)
+{
+       struct declaration_integer *integer_declaration =
+               integer_definition->declaration;
+       uint64_t oldval, newval, updateval;
+
+       if (integer_declaration->len == 64) {
+               stream->timestamp = integer_definition->value._unsigned;
+               return;
+       }
+       /* keep low bits */
+       oldval = stream->timestamp;
+       oldval &= (1ULL << integer_declaration->len) - 1;
+       newval = integer_definition->value._unsigned;
+       /* Test for overflow by comparing low bits */
+       if (newval < oldval)
+               newval += 1ULL << integer_declaration->len;
+       /* updateval contains old high bits, and new low bits (sum) */
+       updateval = stream->timestamp;
+       updateval &= ~((1ULL << integer_declaration->len) - 1);
+       updateval += newval;
+       stream->timestamp = updateval;
+}
+
 static
 int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
 {
        struct ctf_stream_pos *pos =
                container_of(ppos, struct ctf_stream_pos, parent);
        struct ctf_stream_class *stream_class = stream->stream_class;
-       struct ctf_event *event_class;
+       struct ctf_stream_event *event;
        uint64_t id = 0;
        int ret;
 
@@ -99,49 +127,51 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
                return EOF;
 
        /* Read event header */
-       if (stream_class->event_header) {
+       if (stream->stream_event_header) {
                struct definition_integer *integer_definition;
+               struct definition *variant;
 
-               ret = generic_rw(ppos, &stream_class->event_header->p);
+               ret = generic_rw(ppos, &stream->stream_event_header->p);
                if (ret)
                        goto error;
                /* lookup event id */
-               integer_definition = lookup_integer(&stream_class->event_header->p, "id", FALSE);
+               integer_definition = lookup_integer(&stream->stream_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);
+                       enum_definition = lookup_enum(&stream->stream_event_header->p, "id", FALSE);
                        if (enum_definition) {
                                id = enum_definition->integer->value._unsigned;
                        }
                }
 
+               variant = lookup_variant(&stream->stream_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);
+               integer_definition = lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE);
                if (integer_definition) {
-                       stream->timestamp = integer_definition->value._unsigned;
+                       ctf_update_timestamp(stream, integer_definition);
                } else {
-                       struct definition *definition;
-
-                       definition = lookup_variant(&stream_class->event_header->p, "v");
-                       if (definition) {
-                               integer_definition = lookup_integer(definition, "id", FALSE);
+                       if (variant) {
+                               integer_definition = lookup_integer(variant, "timestamp", 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;
+                                       ctf_update_timestamp(stream, integer_definition);
                                }
                        }
                }
        }
 
        /* Read stream-declared event context */
-       if (stream_class->event_context) {
-               ret = generic_rw(ppos, &stream_class->event_context->p);
+       if (stream->stream_event_context) {
+               ret = generic_rw(ppos, &stream->stream_event_context->p);
                if (ret)
                        goto error;
        }
@@ -150,22 +180,22 @@ int ctf_read_event(struct stream_pos *ppos, struct ctf_stream *stream)
                fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
                return -EINVAL;
        }
-       event_class = g_ptr_array_index(stream_class->events_by_id, id);
-       if (!event_class) {
+       event = g_ptr_array_index(stream->events_by_id, id);
+       if (!event) {
                fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
                return -EINVAL;
        }
 
        /* Read event-declared event context */
-       if (event_class->context) {
-               ret = generic_rw(ppos, &event_class->context->p);
+       if (event->event_context) {
+               ret = generic_rw(ppos, &event->event_context->p);
                if (ret)
                        goto error;
        }
 
        /* Read event payload */
-       if (event_class->fields) {
-               ret = generic_rw(ppos, &event_class->fields->p);
+       if (event->event_fields) {
+               ret = generic_rw(ppos, &event->event_fields->p);
                if (ret)
                        goto error;
        }
@@ -181,35 +211,44 @@ static
 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;
+       struct ctf_stream_event *event;
        uint64_t id = 0;
-       int len_index;
        int ret;
 
        /* print event header */
-       if (stream_class->event_header) {
+       if (stream->stream_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;
+               integer_definition = lookup_integer(&stream->stream_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->stream_event_header->p, "id", FALSE);
+                       if (enum_definition) {
+                               id = enum_definition->integer->value._unsigned;
+                       }
                }
 
-               ret = generic_rw(pos, &stream_class->event_header->p);
+               variant = lookup_variant(&stream->stream_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->stream_event_header->p);
                if (ret)
                        goto error;
        }
 
        /* print stream-declared event context */
-       if (stream_class->event_context) {
-               ret = generic_rw(pos, &stream_class->event_context->p);
+       if (stream->stream_event_context) {
+               ret = generic_rw(pos, &stream->stream_event_context->p);
                if (ret)
                        goto error;
        }
@@ -218,22 +257,22 @@ int ctf_write_event(struct stream_pos *pos, struct ctf_stream *stream)
                fprintf(stdout, "[error] Event id %" PRIu64 " is outside range.\n", id);
                return -EINVAL;
        }
-       event_class = g_ptr_array_index(stream_class->events_by_id, id);
-       if (!event_class) {
+       event = g_ptr_array_index(stream->events_by_id, id);
+       if (!event) {
                fprintf(stdout, "[error] Event id %" PRIu64 " is unknown.\n", id);
                return -EINVAL;
        }
 
        /* print event-declared event context */
-       if (event_class->context) {
-               ret = generic_rw(pos, &event_class->context->p);
+       if (event->event_context) {
+               ret = generic_rw(pos, &event->event_context->p);
                if (ret)
                        goto error;
        }
 
        /* Read and print event payload */
-       if (event_class->fields) {
-               ret = generic_rw(pos, &event_class->fields->p);
+       if (event->event_fields) {
+               ret = generic_rw(pos, &event->event_fields->p);
                if (ret)
                        goto error;
        }
@@ -301,6 +340,8 @@ void ctf_fini_pos(struct ctf_stream_pos *pos)
 
 void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
 {
+       struct ctf_file_stream *file_stream =
+               container_of(pos, struct ctf_file_stream, pos);
        int ret;
        off_t off;
        struct packet_index *index;
@@ -366,9 +407,15 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                pos->mmap_offset = index->offset;
 
                /* Lookup context/packet size in index */
+               file_stream->stream.timestamp = index->timestamp_begin;
                pos->content_size = index->content_size;
                pos->packet_size = index->packet_size;
-               pos->offset = index->data_offset;
+               if (index->data_offset < index->content_size)
+                       pos->offset = 0;        /* will read headers */
+               else {
+                       pos->offset = EOF;
+                       return;
+               }
        }
        /* map new base. Need mapping length from header. */
        pos->base = mmap(NULL, pos->packet_size / CHAR_BIT, pos->prot,
@@ -378,6 +425,18 @@ void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
                        strerror(errno));
                assert(0);
        }
+
+       /* update trace_packet_header and stream_packet_context */
+       if (pos->prot != PROT_WRITE && file_stream->stream.trace_packet_header) {
+               /* Read packet header */
+               ret = generic_rw(&pos->parent, &file_stream->stream.trace_packet_header->p);
+               assert(!ret);
+       }
+       if (pos->prot != PROT_WRITE && file_stream->stream.stream_packet_context) {
+               /* Read packet context */
+               ret = generic_rw(&pos->parent, &file_stream->stream.stream_packet_context->p);
+               assert(!ret);
+       }
 }
 
 static
@@ -449,7 +508,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in,
                        return -EINVAL;
        }
 
-       toread = header.content_size / CHAR_BIT;
+       toread = (header.content_size / CHAR_BIT) - header_sizeof(header);
 
        for (;;) {
                readlen = fread(buf, sizeof(char), min(sizeof(buf), toread), in);
@@ -457,7 +516,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;
@@ -485,6 +548,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;
@@ -502,7 +570,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;
 }
 
@@ -578,6 +646,125 @@ end_stream:
        return ret;
 }
 
+static
+struct ctf_stream_event *create_event_definitions(struct ctf_trace *td,
+                                                 struct ctf_stream *stream,
+                                                 struct ctf_event *event)
+{
+       struct ctf_stream_event *stream_event = g_new0(struct ctf_stream_event, 1);
+
+       if (event->context_decl) {
+               struct definition *definition =
+                       event->context_decl->p.definition_new(&event->context_decl->p,
+                               stream->parent_def_scope, 0, 0, "event.context");
+               if (!definition) {
+                       goto error;
+               }
+               stream_event->event_context = container_of(definition,
+                                       struct definition_struct, p);
+               stream->parent_def_scope = stream_event->event_context->p.scope;
+       }
+       if (event->fields_decl) {
+               struct definition *definition =
+                       event->fields_decl->p.definition_new(&event->fields_decl->p,
+                               stream->parent_def_scope, 0, 0, "event.fields");
+               if (!definition) {
+                       goto error;
+               }
+               stream_event->event_fields = container_of(definition,
+                                       struct definition_struct, p);
+               stream->parent_def_scope = stream_event->event_fields->p.scope;
+       }
+       return stream_event;
+
+error:
+       if (stream_event->event_fields)
+               definition_unref(&stream_event->event_fields->p);
+       if (stream_event->event_context)
+               definition_unref(&stream_event->event_context->p);
+       return NULL;
+}
+
+static
+int create_stream_definitions(struct ctf_trace *td, struct ctf_stream *stream)
+{
+       struct ctf_stream_class *stream_class;
+       int ret;
+       int i;
+
+       if (stream->stream_definitions_created)
+               return 0;
+
+       stream_class = stream->stream_class;
+
+       if (stream_class->packet_context_decl) {
+               struct definition *definition =
+                       stream_class->packet_context_decl->p.definition_new(&stream_class->packet_context_decl->p,
+                               stream->parent_def_scope, 0, 0, "stream.packet.context");
+               if (!definition) {
+                       ret = -EINVAL;
+                       goto error;
+               }
+               stream->stream_packet_context = container_of(definition,
+                                               struct definition_struct, p);
+               stream->parent_def_scope = stream->stream_packet_context->p.scope;
+       }
+       if (stream_class->event_header_decl) {
+               struct definition *definition =
+                       stream_class->event_header_decl->p.definition_new(&stream_class->event_header_decl->p,
+                               stream->parent_def_scope, 0, 0, "stream.event.header");
+               if (!definition) {
+                       ret = -EINVAL;
+                       goto error;
+               }
+               stream->stream_event_header =
+                       container_of(definition, struct definition_struct, p);
+               stream->parent_def_scope = stream->stream_event_header->p.scope;
+       }
+       if (stream_class->event_context_decl) {
+               struct definition *definition =
+                       stream_class->event_context_decl->p.definition_new(&stream_class->event_context_decl->p,
+                               stream->parent_def_scope, 0, 0, "stream.event.context");
+               if (!definition) {
+                       ret = -EINVAL;
+                       goto error;
+               }
+               stream->stream_event_context =
+                       container_of(definition, struct definition_struct, p);
+               stream->parent_def_scope = stream->stream_event_context->p.scope;
+       }
+       stream->events_by_id = g_ptr_array_new();
+       g_ptr_array_set_size(stream->events_by_id, stream_class->events_by_id->len);
+       for (i = 0; i < stream->events_by_id->len; i++) {
+               struct ctf_event *event = g_ptr_array_index(stream_class->events_by_id, i);
+               struct ctf_stream_event *stream_event;
+
+               if (!event)
+                       continue;
+               stream_event = create_event_definitions(td, stream, event);
+               if (!stream_event)
+                       goto error_event;
+               g_ptr_array_index(stream->events_by_id, i) = stream_event;
+       }
+       return 0;
+
+error_event:
+       for (i = 0; i < stream->events_by_id->len; i++) {
+               struct ctf_stream_event *stream_event = g_ptr_array_index(stream->events_by_id, i);
+               if (stream_event)
+                       g_free(stream_event);
+       }
+       g_ptr_array_free(stream->events_by_id, TRUE);
+error:
+       if (stream->stream_event_context)
+               definition_unref(&stream->stream_event_context->p);
+       if (stream->stream_event_header)
+               definition_unref(&stream->stream_event_header->p);
+       if (stream->stream_packet_context)
+               definition_unref(&stream->stream_packet_context->p);
+       return ret;
+}
+
 
 static
 int create_stream_packet_index(struct ctf_trace *td,
@@ -597,6 +784,9 @@ int create_stream_packet_index(struct ctf_trace *td,
        if (ret < 0)
                return ret;
 
+       if (filestats.st_size < MAX_PACKET_HEADER_LEN / CHAR_BIT)
+               return -EINVAL;
+
        for (pos->mmap_offset = 0; pos->mmap_offset < filestats.st_size; ) {
                uint64_t stream_id = 0;
 
@@ -620,19 +810,21 @@ int create_stream_packet_index(struct ctf_trace *td,
                packet_index.offset = pos->mmap_offset;
                packet_index.content_size = 0;
                packet_index.packet_size = 0;
+               packet_index.timestamp_begin = 0;
+               packet_index.timestamp_end = 0;
 
                /* read and check header, set stream id (and check) */
-               if (td->packet_header) {
+               if (file_stream->stream.trace_packet_header) {
                        /* Read packet header */
-                       ret = generic_rw(&pos->parent, &td->packet_header->p);
+                       ret = generic_rw(&pos->parent, &file_stream->stream.trace_packet_header->p);
                        if (ret)
                                return ret;
-                       len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("magic"));
+                       len_index = struct_declaration_lookup_field_index(file_stream->stream.trace_packet_header->declaration, g_quark_from_static_string("magic"));
                        if (len_index >= 0) {
                                struct definition_integer *defint;
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(td->packet_header, len_index);
+                               field = struct_definition_get_field_from_index(file_stream->stream.trace_packet_header, len_index);
                                assert(field->declaration->id == CTF_TYPE_INTEGER);
                                defint = container_of(field, struct definition_integer, p);
                                assert(defint->declaration->signedness == FALSE);
@@ -646,14 +838,14 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
                        /* check uuid */
-                       len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("uuid"));
+                       len_index = struct_declaration_lookup_field_index(file_stream->stream.trace_packet_header->declaration, g_quark_from_static_string("uuid"));
                        if (len_index >= 0) {
                                struct definition_array *defarray;
                                struct definition *field;
                                uint64_t i;
                                uint8_t uuidval[UUID_LEN];
 
-                               field = struct_definition_get_field_from_index(td->packet_header, len_index);
+                               field = struct_definition_get_field_from_index(file_stream->stream.trace_packet_header, len_index);
                                assert(field->declaration->id == CTF_TYPE_ARRAY);
                                defarray = container_of(field, struct definition_array, p);
                                assert(array_len(defarray) == UUID_LEN);
@@ -676,12 +868,12 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
 
-                       len_index = struct_declaration_lookup_field_index(td->packet_header->declaration, g_quark_from_static_string("stream_id"));
+                       len_index = struct_declaration_lookup_field_index(file_stream->stream.trace_packet_header->declaration, g_quark_from_static_string("stream_id"));
                        if (len_index >= 0) {
                                struct definition_integer *defint;
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(td->packet_header, len_index);
+                               field = struct_definition_get_field_from_index(file_stream->stream.trace_packet_header, len_index);
                                assert(field->declaration->id == CTF_TYPE_INTEGER);
                                defint = container_of(field, struct definition_integer, p);
                                assert(defint->declaration->signedness == FALSE);
@@ -708,18 +900,22 @@ int create_stream_packet_index(struct ctf_trace *td,
                }
                first_packet = 0;
 
-               if (stream->packet_context) {
+               ret = create_stream_definitions(td, &file_stream->stream);
+               if (ret)
+                       return ret;
+
+               if (file_stream->stream.stream_packet_context) {
                        /* Read packet context */
-                       ret = generic_rw(&pos->parent, &stream->packet_context->p);
+                       ret = generic_rw(&pos->parent, &file_stream->stream.stream_packet_context->p);
                        if (ret)
                                return ret;
                        /* read content size from header */
-                       len_index = struct_declaration_lookup_field_index(stream->packet_context->declaration, g_quark_from_static_string("content_size"));
+                       len_index = struct_declaration_lookup_field_index(file_stream->stream.stream_packet_context->declaration, g_quark_from_static_string("content_size"));
                        if (len_index >= 0) {
                                struct definition_integer *defint;
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(stream->packet_context, len_index);
+                               field = struct_definition_get_field_from_index(file_stream->stream.stream_packet_context, len_index);
                                assert(field->declaration->id == CTF_TYPE_INTEGER);
                                defint = container_of(field, struct definition_integer, p);
                                assert(defint->declaration->signedness == FALSE);
@@ -730,12 +926,12 @@ int create_stream_packet_index(struct ctf_trace *td,
                        }
 
                        /* read packet size from header */
-                       len_index = struct_declaration_lookup_field_index(stream->packet_context->declaration, g_quark_from_static_string("packet_size"));
+                       len_index = struct_declaration_lookup_field_index(file_stream->stream.stream_packet_context->declaration, g_quark_from_static_string("packet_size"));
                        if (len_index >= 0) {
                                struct definition_integer *defint;
                                struct definition *field;
 
-                               field = struct_definition_get_field_from_index(stream->packet_context, len_index);
+                               field = struct_definition_get_field_from_index(file_stream->stream.stream_packet_context, len_index);
                                assert(field->declaration->id == CTF_TYPE_INTEGER);
                                defint = container_of(field, struct definition_integer, p);
                                assert(defint->declaration->signedness == FALSE);
@@ -744,6 +940,32 @@ int create_stream_packet_index(struct ctf_trace *td,
                                /* Use content size if non-zero, else file size */
                                packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
                        }
+
+                       /* read timestamp begin from header */
+                       len_index = struct_declaration_lookup_field_index(file_stream->stream.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
+                       if (len_index >= 0) {
+                               struct definition_integer *defint;
+                               struct definition *field;
+
+                               field = struct_definition_get_field_from_index(file_stream->stream.stream_packet_context, len_index);
+                               assert(field->declaration->id == CTF_TYPE_INTEGER);
+                               defint = container_of(field, struct definition_integer, p);
+                               assert(defint->declaration->signedness == FALSE);
+                               packet_index.timestamp_begin = defint->value._unsigned;
+                       }
+
+                       /* read timestamp end from header */
+                       len_index = struct_declaration_lookup_field_index(file_stream->stream.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
+                       if (len_index >= 0) {
+                               struct definition_integer *defint;
+                               struct definition *field;
+
+                               field = struct_definition_get_field_from_index(file_stream->stream.stream_packet_context, len_index);
+                               assert(field->declaration->id == CTF_TYPE_INTEGER);
+                               defint = container_of(field, struct definition_integer, p);
+                               assert(defint->declaration->signedness == FALSE);
+                               packet_index.timestamp_end = defint->value._unsigned;
+                       }
                } else {
                        /* Use file size for packet size */
                        packet_index.content_size = filestats.st_size * CHAR_BIT;
@@ -779,6 +1001,30 @@ int create_stream_packet_index(struct ctf_trace *td,
        return 0;
 }
 
+static
+int create_trace_definitions(struct ctf_trace *td, struct ctf_stream *stream)
+{
+       int ret;
+
+       if (td->packet_header_decl) {
+               struct definition *definition =
+                       td->packet_header_decl->p.definition_new(&td->packet_header_decl->p,
+                               stream->parent_def_scope, 0, 0, "trace.packet.header");
+               if (!definition) {
+                       ret = -EINVAL;
+                       goto error;
+               }
+               stream->trace_packet_header = 
+                       container_of(definition, struct definition_struct, p);
+               stream->parent_def_scope = stream->trace_packet_header->p.scope;
+       }
+
+       return 0;
+
+error:
+       return ret;
+}
+
 /*
  * Note: many file streams can inherit from the same stream class
  * description (metadata).
@@ -794,6 +1040,9 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags)
                goto error;
        file_stream = g_new0(struct ctf_file_stream, 1);
        ctf_init_pos(&file_stream->pos, ret, flags);
+       ret = create_trace_definitions(td, &file_stream->stream);
+       if (ret)
+               goto error_def;
        ret = create_stream_packet_index(td, file_stream);
        if (ret)
                goto error_index;
@@ -802,6 +1051,9 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags)
        return 0;
 
 error_index:
+       if (file_stream->stream.trace_packet_header)
+               definition_unref(&file_stream->stream.trace_packet_header->p);
+error_def:
        ctf_fini_pos(&file_stream->pos);
        close(file_stream->pos.fd);
        g_free(file_stream);
@@ -887,6 +1139,7 @@ error:
        return ret;
 }
 
+static
 struct trace_descriptor *ctf_open_trace(const char *path, int flags)
 {
        struct ctf_trace *td;
@@ -925,6 +1178,7 @@ void ctf_close_file_stream(struct ctf_file_stream *file_stream)
        close(file_stream->pos.fd);
 }
 
+static
 void ctf_close_trace(struct trace_descriptor *tdp)
 {
        struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent);
@@ -934,7 +1188,10 @@ void ctf_close_trace(struct trace_descriptor *tdp)
                for (i = 0; i < td->streams->len; i++) {
                        struct ctf_stream_class *stream;
                        int j;
+
                        stream = g_ptr_array_index(td->streams, i);
+                       if (!stream)
+                               continue;
                        for (j = 0; j < stream->files->len; j++) {
                                struct ctf_file_stream *file_stream;
                                file_stream = g_ptr_array_index(stream->files, j);
This page took 0.032438 seconds and 4 git commands to generate.