X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=19ecfdc2ba87cd6143af0c5685a68c297ea67acf;hb=85e2085e04672b7ca72960e5c17b8441275d91a0;hp=521d7ad0643f31fcc2a72d46ebd1414dc25e8bcc;hpb=cb2f43eea2515ca1d2d97e24cbb067f7804a651c;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 521d7ad0..19ecfdc2 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -1049,7 +1049,7 @@ warning: } static -int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, +int ctf_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, FILE *out) { struct metadata_packet_header header; @@ -1139,7 +1139,7 @@ read_padding: } static -int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, +int ctf_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, char **buf) { FILE *in, *out; @@ -1158,7 +1158,7 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, return -errno; } for (;;) { - ret = ctf_open_trace_metadata_packet_read(td, in, out); + ret = ctf_trace_metadata_packet_read(td, in, out); if (ret) { break; } @@ -1199,11 +1199,9 @@ int ctf_open_trace_metadata_stream_read(struct ctf_trace *td, FILE **fp, } static -int ctf_open_trace_metadata_read(struct ctf_trace *td, - void (*packet_seek)(struct bt_stream_pos *pos, size_t index, - int whence), FILE *metadata_fp) +int ctf_trace_metadata_read(struct ctf_trace *td, FILE *metadata_fp, + struct ctf_scanner *scanner, int append) { - struct ctf_scanner *scanner; struct ctf_file_stream *metadata_stream; FILE *fp; char *buf = NULL; @@ -1212,14 +1210,6 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, metadata_stream = g_new0(struct ctf_file_stream, 1); metadata_stream->pos.last_offset = LAST_OFFSET_POISON; - if (packet_seek) { - metadata_stream->pos.packet_seek = packet_seek; - } else { - fprintf(stderr, "[error] packet_seek function undefined.\n"); - ret = -1; - goto end_free; - } - if (metadata_fp) { fp = metadata_fp; metadata_stream->pos.fd = -1; @@ -1246,37 +1236,33 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, yydebug = 1; if (packet_metadata(td, fp)) { - ret = ctf_open_trace_metadata_stream_read(td, &fp, &buf); + ret = ctf_trace_metadata_stream_read(td, &fp, &buf); if (ret) { /* Warn about empty metadata */ fprintf(stderr, "[warning] Empty metadata.\n"); - goto end_packet_read; + goto end; } td->metadata_string = buf; td->metadata_packetized = 1; } else { - unsigned int major, minor; - ssize_t nr_items; - - td->byte_order = BYTE_ORDER; - - /* Check text-only metadata header and version */ - nr_items = fscanf(fp, "/* CTF %u.%u", &major, &minor); - if (nr_items < 2) - fprintf(stderr, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n"); - if (check_version(major, minor) < 0) { - ret = -EINVAL; - goto end_packet_read; + if (!append) { + unsigned int major, minor; + ssize_t nr_items; + + td->byte_order = BYTE_ORDER; + + /* Check text-only metadata header and version */ + nr_items = fscanf(fp, "/* CTF %10u.%10u", &major, &minor); + if (nr_items < 2) + fprintf(stderr, "[warning] Ill-shapen or missing \"/* CTF x.y\" header for text-only metadata.\n"); + if (check_version(major, minor) < 0) { + ret = -EINVAL; + goto end; + } + rewind(fp); } - rewind(fp); } - scanner = ctf_scanner_alloc(); - if (!scanner) { - fprintf(stderr, "[error] Error allocating scanner\n"); - ret = -ENOMEM; - goto end_scanner_alloc; - } ret = ctf_scanner_append_ast(scanner, fp); if (ret) { fprintf(stderr, "[error] Error creating AST\n"); @@ -1303,9 +1289,6 @@ int ctf_open_trace_metadata_read(struct ctf_trace *td, goto end; } end: - ctf_scanner_free(scanner); -end_scanner_alloc: -end_packet_read: if (fp) { closeret = fclose(fp); if (closeret) { @@ -1367,6 +1350,36 @@ error: return NULL; } +static +int copy_event_declarations_stream_class_to_stream(struct ctf_trace *td, + struct ctf_stream_declaration *stream_class, + struct ctf_stream_definition *stream) +{ + size_t def_size, class_size, i; + int ret = 0; + + def_size = stream->events_by_id->len; + class_size = stream_class->events_by_id->len; + + g_ptr_array_set_size(stream->events_by_id, class_size); + for (i = def_size; i < class_size; i++) { + struct ctf_event_declaration *event = + g_ptr_array_index(stream_class->events_by_id, i); + struct ctf_event_definition *stream_event; + + if (!event) + continue; + stream_event = create_event_definitions(td, stream, event); + if (!stream_event) { + ret = -EINVAL; + goto error; + } + g_ptr_array_index(stream->events_by_id, i) = stream_event; + } +error: + return ret; +} + static int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition *stream) { @@ -1416,20 +1429,10 @@ int create_stream_definitions(struct ctf_trace *td, struct ctf_stream_definition 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_declaration *event = g_ptr_array_index(stream_class->events_by_id, i); - struct ctf_event_definition *stream_event; - - if (!event) - continue; - stream_event = create_event_definitions(td, stream, event); - if (!stream_event) { - ret = -EINVAL; - goto error_event; - } - g_ptr_array_index(stream->events_by_id, i) = stream_event; - } + ret = copy_event_declarations_stream_class_to_stream(td, + stream_class, stream); + if (ret) + goto error_event; return 0; error_event: @@ -1812,9 +1815,10 @@ int import_stream_packet_index(struct ctf_trace *td, struct ctf_file_stream *file_stream) { struct ctf_stream_pos *pos; - struct ctf_packet_index ctf_index; + struct ctf_packet_index *ctf_index = NULL; struct ctf_packet_index_file_hdr index_hdr; struct packet_index index; + uint32_t packet_index_len; int ret = 0; int first_packet = 1; size_t len; @@ -1842,27 +1846,32 @@ int import_stream_packet_index(struct ctf_trace *td, ret = -1; goto error; } - if (index_hdr.packet_index_len == 0) { + packet_index_len = be32toh(index_hdr.packet_index_len); + if (packet_index_len == 0) { fprintf(stderr, "[error] Packet index length cannot be 0.\n"); ret = -1; goto error; } - - while (fread(&ctf_index, index_hdr.packet_index_len, 1, + /* + * Allocate the index length found in header, not internal + * representation. + */ + ctf_index = g_malloc0(packet_index_len); + while (fread(ctf_index, packet_index_len, 1, pos->index_fp) == 1) { uint64_t stream_id; struct ctf_stream_declaration *stream = NULL; memset(&index, 0, sizeof(index)); - index.offset = be64toh(ctf_index.offset); - index.packet_size = be64toh(ctf_index.packet_size); - index.content_size = be64toh(ctf_index.content_size); - index.ts_cycles.timestamp_begin = be64toh(ctf_index.timestamp_begin); - index.ts_cycles.timestamp_end = be64toh(ctf_index.timestamp_end); - index.events_discarded = be64toh(ctf_index.events_discarded); + index.offset = be64toh(ctf_index->offset); + index.packet_size = be64toh(ctf_index->packet_size); + index.content_size = be64toh(ctf_index->content_size); + index.ts_cycles.timestamp_begin = be64toh(ctf_index->timestamp_begin); + index.ts_cycles.timestamp_end = be64toh(ctf_index->timestamp_end); + index.events_discarded = be64toh(ctf_index->events_discarded); index.events_discarded_len = 64; index.data_offset = -1; - stream_id = be64toh(ctf_index.stream_id); + stream_id = be64toh(ctf_index->stream_id); if (!first_packet) { /* add index to packet array */ @@ -1899,6 +1908,7 @@ int import_stream_packet_index(struct ctf_trace *td, ret = 0; error: + g_free(ctf_index); return ret; } @@ -2045,6 +2055,7 @@ int ctf_open_trace_read(struct ctf_trace *td, void (*packet_seek)(struct bt_stream_pos *pos, size_t index, int whence), FILE *metadata_fp) { + struct ctf_scanner *scanner; int ret, closeret; struct dirent *dirent; struct dirent *diriter; @@ -2073,9 +2084,17 @@ int ctf_open_trace_read(struct ctf_trace *td, /* * Keep the metadata file separate. + * Keep scanner object local to the open. We don't support + * incremental metadata append for on-disk traces. */ - - ret = ctf_open_trace_metadata_read(td, packet_seek, metadata_fp); + scanner = ctf_scanner_alloc(); + if (!scanner) { + fprintf(stderr, "[error] Error allocating scanner\n"); + ret = -ENOMEM; + goto error_metadata; + } + ret = ctf_trace_metadata_read(td, metadata_fp, scanner, 0); + ctf_scanner_free(scanner); if (ret) { fprintf(stderr, "[warning] Unable to open trace metadata for path \"%s\".\n", path); goto error_metadata; @@ -2286,7 +2305,13 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td, int ret; struct bt_mmap_stream *mmap_info; - ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp); + td->scanner = ctf_scanner_alloc(); + if (!td->scanner) { + fprintf(stderr, "[error] Error allocating scanner\n"); + ret = -ENOMEM; + goto error; + } + ret = ctf_trace_metadata_read(td, metadata_fp, td->scanner, 0); if (ret) { goto error; } @@ -2302,10 +2327,10 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td, goto error; } } - return 0; error: + ctf_scanner_free(td->scanner); return ret; } @@ -2342,6 +2367,41 @@ error: return NULL; } +int ctf_append_trace_metadata(struct bt_trace_descriptor *tdp, + FILE *metadata_fp) +{ + struct ctf_trace *td = container_of(tdp, struct ctf_trace, parent); + int i, j; + int ret; + + if (!td->scanner) + return -EINVAL; + ret = ctf_trace_metadata_read(td, metadata_fp, td->scanner, 1); + if (ret) + return ret; + /* for each stream_class */ + for (i = 0; i < td->streams->len; i++) { + struct ctf_stream_declaration *stream_class; + + stream_class = g_ptr_array_index(td->streams, i); + if (!stream_class) + continue; + /* for each stream */ + for (j = 0; j < stream_class->streams->len; j++) { + struct ctf_stream_definition *stream; + + stream = g_ptr_array_index(stream_class->streams, j); + if (!stream) + continue; + ret = copy_event_declarations_stream_class_to_stream(td, + stream_class, stream); + if (ret) + return ret; + } + } + return 0; +} + static int ctf_convert_index_timestamp(struct bt_trace_descriptor *tdp) { @@ -2434,6 +2494,7 @@ int ctf_close_trace(struct bt_trace_descriptor *tdp) } } ctf_destroy_metadata(td); + ctf_scanner_free(td->scanner); if (td->dirfd >= 0) { ret = close(td->dirfd); if (ret) {