X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=098b7eb15d7d4589880243ed7d0ecdc66c7b4152;hp=13c87eae176651fe97b1fd0c25d3871e5f02f6a4;hb=01c76b246be85b5d9c8e99813950fb194c9f714f;hpb=7f4b5c4d89ec59fed423be83ca49811459329679 diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 13c87eae..098b7eb1 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -3,7 +3,9 @@ * * Format registration. * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -52,7 +54,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 @@ -63,8 +67,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 +79,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 @@ -85,59 +89,94 @@ 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 len_index; int ret; if (pos->offset == EOF) return EOF; /* Read event header */ - if (stream_class->event_header) { - ret = generic_rw(ppos, &stream_class->event_header->p); + if (stream->stream_event_header) { + struct definition_integer *integer_definition; + struct definition *variant; + + ret = generic_rw(ppos, &stream->stream_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->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; + } } - /* 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->stream_event_header->p, "v"); + if (variant) { + integer_definition = lookup_integer(variant, "id", FALSE); + if (integer_definition) { + id = integer_definition->value._unsigned; + } } + /* lookup timestamp */ + stream->has_timestamp = 0; + integer_definition = lookup_integer(&stream->stream_event_header->p, "timestamp", FALSE); + if (integer_definition) { + ctf_update_timestamp(stream, integer_definition); + stream->has_timestamp = 1; + } else { + if (variant) { + integer_definition = lookup_integer(variant, "timestamp", FALSE); + if (integer_definition) { + ctf_update_timestamp(stream, integer_definition); + stream->has_timestamp = 1; + } + } + } } /* 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; } @@ -146,22 +185,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; } @@ -177,35 +216,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; + } + } + + 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_class->event_header->p); + 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; } @@ -214,22 +262,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; } @@ -297,6 +345,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; @@ -362,9 +412,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->parent.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, @@ -374,6 +430,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->parent.trace_packet_header) { + /* Read packet header */ + ret = generic_rw(&pos->parent, &file_stream->parent.trace_packet_header->p); + assert(!ret); + } + if (pos->prot != PROT_WRITE && file_stream->parent.stream_packet_context) { + /* Read packet context */ + ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p); + assert(!ret); + } } static @@ -407,7 +475,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, { struct metadata_packet_header header; size_t readlen, writelen, toread; - char buf[4096]; + char buf[4096 + 1]; /* + 1 for debug-mode \0 */ int ret = 0; readlen = fread(&header, header_sizeof(header), 1, in); @@ -445,15 +513,20 @@ 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); + readlen = fread(buf, sizeof(char), min(sizeof(buf) - 1, toread), in); if (ferror(in)) { ret = -EINVAL; break; } - printf("read %s\n", buf); + if (babeltrace_debug) { + buf[readlen] = '\0'; + fprintf(stdout, "[debug] metadata packet read: %s\n", + buf); + } + writelen = fwrite(buf, sizeof(char), readlen, out); if (writelen < readlen) { ret = -EIO; @@ -481,6 +554,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 +576,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; } @@ -506,20 +584,23 @@ static int ctf_open_trace_metadata_read(struct ctf_trace *td) { struct ctf_scanner *scanner; + struct ctf_file_stream *metadata_stream; FILE *fp; char *buf = NULL; int ret = 0; - td->metadata.pos.fd = openat(td->dirfd, "metadata", O_RDONLY); - if (td->metadata.pos.fd < 0) { + metadata_stream = g_new0(struct ctf_file_stream, 1); + td->metadata = &metadata_stream->parent; + metadata_stream->pos.fd = openat(td->dirfd, "metadata", O_RDONLY); + if (metadata_stream->pos.fd < 0) { fprintf(stdout, "Unable to open metadata.\n"); - return td->metadata.pos.fd; + return metadata_stream->pos.fd; } if (babeltrace_debug) yydebug = 1; - fp = fdopen(td->metadata.pos.fd, "r"); + fp = fdopen(metadata_stream->pos.fd, "r"); if (!fp) { fprintf(stdout, "[error] Unable to open metadata stream.\n"); ret = -errno; @@ -570,7 +651,128 @@ end_packet_read: fclose(fp); free(buf); end_stream: - close(td->metadata.pos.fd); + close(metadata_stream->pos.fd); + if (ret) + g_free(metadata_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; } @@ -593,6 +795,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; @@ -616,19 +821,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->parent.trace_packet_header) { /* Read packet header */ - ret = generic_rw(&pos->parent, &td->packet_header->p); + ret = generic_rw(&pos->parent, &file_stream->parent.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->parent.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->parent.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); @@ -642,14 +849,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->parent.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->parent.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); @@ -672,12 +879,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->parent.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->parent.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); @@ -685,12 +892,12 @@ int create_stream_packet_index(struct ctf_trace *td, } } - if (!first_packet && file_stream->stream_id != stream_id) { + if (!first_packet && file_stream->parent.stream_id != stream_id) { fprintf(stdout, "[error] Stream ID is changing within a stream.\n"); return -EINVAL; } if (first_packet) { - file_stream->stream_id = stream_id; + file_stream->parent.stream_id = stream_id; if (stream_id >= td->streams->len) { fprintf(stdout, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id); return -EINVAL; @@ -700,22 +907,25 @@ int create_stream_packet_index(struct ctf_trace *td, fprintf(stdout, "[error] Stream %" PRIu64 " is not declared in metadata.\n", stream_id); return -EINVAL; } - file_stream->stream.stream_class = stream; + file_stream->parent.stream_class = stream; + ret = create_stream_definitions(td, &file_stream->parent); + if (ret) + return ret; } first_packet = 0; - if (stream->packet_context) { + if (file_stream->parent.stream_packet_context) { /* Read packet context */ - ret = generic_rw(&pos->parent, &stream->packet_context->p); + ret = generic_rw(&pos->parent, &file_stream->parent.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->parent.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->parent.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); @@ -726,12 +936,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->parent.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->parent.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); @@ -740,6 +950,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->parent.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->parent.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->parent.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->parent.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; @@ -756,7 +992,7 @@ int create_stream_packet_index(struct ctf_trace *td, if (packet_index.packet_size > (filestats.st_size - packet_index.offset) * CHAR_BIT) { fprintf(stdout, "[error] Packet size (%zu bits) is larger than remaining file size (%zu bits).\n", - packet_index.content_size, (filestats.st_size - packet_index.offset) * CHAR_BIT); + packet_index.content_size, (size_t) (filestats.st_size - packet_index.offset) * CHAR_BIT); return -EINVAL; } @@ -775,6 +1011,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). @@ -790,14 +1050,21 @@ 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->parent); + if (ret) + goto error_def; ret = create_stream_packet_index(td, file_stream); if (ret) goto error_index; /* Add stream file to stream class */ - g_ptr_array_add(file_stream->stream.stream_class->files, file_stream); + g_ptr_array_add(file_stream->parent.stream_class->streams, + &file_stream->parent); return 0; error_index: + if (file_stream->parent.trace_packet_header) + definition_unref(&file_stream->parent.trace_packet_header->p); +error_def: ctf_fini_pos(&file_stream->pos); close(file_stream->pos.fd); g_free(file_stream); @@ -883,6 +1150,7 @@ error: return ret; } +static struct trace_descriptor *ctf_open_trace(const char *path, int flags) { struct ctf_trace *td; @@ -921,6 +1189,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); @@ -930,10 +1199,13 @@ 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); - for (j = 0; j < stream->files->len; j++) { + if (!stream) + continue; + for (j = 0; j < stream->streams->len; j++) { struct ctf_file_stream *file_stream; - file_stream = g_ptr_array_index(stream->files, j); + file_stream = container_of(g_ptr_array_index(stream->streams, j), struct ctf_file_stream, parent); ctf_close_file_stream(file_stream); }