X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=fb9b2333cf63180a208ace408b9d9b1b90deebc4;hp=5ddf2f78ddc6e73e85e1936f50dad57672635607;hb=0e1b84aa80398d5573b73ae4d6ae79d6a930a2fd;hpb=a7dd15ff1b8b60bd1defe71ce536464a050b028e diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 5ddf2f78..fb9b2333 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -53,6 +53,7 @@ #include "metadata/ctf-ast.h" #include "events-private.h" #include +#include #define LOG2_CHAR_BIT 3 @@ -84,6 +85,13 @@ uint64_t opt_clock_offset_ns; extern int yydebug; +/* + * TODO: babeltrace_ctf_console_output ensures that we only print + * discarded events when ctf-text plugin is used. Should be cleaned up + * with the plugin system redesign. + */ +int babeltrace_ctf_console_output; + static struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags, void (*packet_seek)(struct bt_stream_pos *pos, size_t index, @@ -279,10 +287,7 @@ void ctf_update_timestamp(struct ctf_stream_definition *stream, uint64_t oldval, newval, updateval; if (unlikely(integer_declaration->len == 64)) { - stream->prev_cycles_timestamp = stream->cycles_timestamp; stream->cycles_timestamp = integer_definition->value._unsigned; - stream->prev_real_timestamp = ctf_get_real_timestamp(stream, - stream->prev_cycles_timestamp); stream->real_timestamp = ctf_get_real_timestamp(stream, stream->cycles_timestamp); return; @@ -298,12 +303,9 @@ void ctf_update_timestamp(struct ctf_stream_definition *stream, updateval = stream->cycles_timestamp; updateval &= ~((1ULL << integer_declaration->len) - 1); updateval += newval; - stream->prev_cycles_timestamp = stream->cycles_timestamp; stream->cycles_timestamp = updateval; /* convert to real timestamp */ - stream->prev_real_timestamp = ctf_get_real_timestamp(stream, - stream->prev_cycles_timestamp); stream->real_timestamp = ctf_get_real_timestamp(stream, stream->cycles_timestamp); } @@ -408,24 +410,39 @@ void print_uuid(FILE *fp, unsigned char *uuid) fprintf(fp, "%x", (unsigned int) uuid[i]); } -void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream, - int end_stream) +/* + * Discarded events can be either: + * - discarded after end of previous buffer due to buffer full: + * happened within range: [ prev_timestamp_end, timestamp_begin ] + * - discarded within current buffer due to either event too large or + * nested wrap-around: + * happened within range: [ timestamp_begin, timestamp_end ] + * + * Given we have discarded counters of those two types merged into the + * events_discarded counter, we need to use the union of those ranges: + * [ prev_timestamp_end, timestamp_end ] + */ +static +void ctf_print_discarded(FILE *fp, struct ctf_stream_definition *stream) { - fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events %sbetween [", - stream->events_discarded, - end_stream ? "at end of stream " : ""); + if (!stream->events_discarded || !babeltrace_ctf_console_output) { + return; + } + fflush(stdout); + fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events between [", + stream->events_discarded); if (opt_clock_cycles) { ctf_print_timestamp(fp, stream, - stream->prev_cycles_timestamp); + stream->prev.cycles.end); fprintf(fp, "] and ["); ctf_print_timestamp(fp, stream, - stream->prev_cycles_timestamp_end); + stream->current.cycles.end); } else { ctf_print_timestamp(fp, stream, - stream->prev_real_timestamp); + stream->prev.real.end); fprintf(fp, "] and ["); ctf_print_timestamp(fp, stream, - stream->prev_real_timestamp_end); + stream->current.real.end); } fprintf(fp, "] in trace UUID "); print_uuid(fp, stream->stream_class->trace->uuid); @@ -747,7 +764,7 @@ int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace, pos->parent.trace = trace; break; case O_RDWR: - pos->prot = PROT_WRITE; /* Write has priority */ + pos->prot = PROT_READ | PROT_WRITE; pos->flags = MAP_SHARED; pos->parent.rw_table = write_dispatch_table; pos->parent.event_cb = ctf_write_event; @@ -763,7 +780,7 @@ int ctf_init_pos(struct ctf_stream_pos *pos, struct bt_trace_descriptor *trace, int ctf_fini_pos(struct ctf_stream_pos *pos) { - if (pos->prot == PROT_WRITE && pos->content_size_loc) + if ((pos->prot & PROT_WRITE) && pos->content_size_loc) *pos->content_size_loc = pos->offset; if (pos->base_mma) { int ret; @@ -788,23 +805,30 @@ void ctf_update_current_packet_index(struct ctf_stream_definition *stream, uint64_t events_discarded_diff; /* Update packet index time information */ - stream->prev_cycles_timestamp_end = - cur_index->ts_cycles.timestamp_end; - stream->prev_cycles_timestamp = + + /* Current packet begin/end */ + stream->current.real.begin = + cur_index->ts_real.timestamp_begin; + stream->current.cycles.begin = cur_index->ts_cycles.timestamp_begin; - stream->prev_real_timestamp_end = + stream->current.real.end = cur_index->ts_real.timestamp_end; - stream->prev_real_timestamp = - cur_index->ts_real.timestamp_begin; - - stream->prev_real_timestamp = - stream->real_timestamp; - stream->prev_cycles_timestamp = - stream->cycles_timestamp; + stream->current.cycles.end = + cur_index->ts_cycles.timestamp_end; /* Update packet index discarded event information */ events_discarded_diff = cur_index->events_discarded; if (prev_index) { + /* Previous packet begin/end */ + stream->prev.cycles.begin = + prev_index->ts_cycles.timestamp_begin; + stream->prev.real.begin = + prev_index->ts_real.timestamp_begin; + stream->prev.cycles.end = + prev_index->ts_cycles.timestamp_end; + stream->prev.real.end = + prev_index->ts_real.timestamp_end; + events_discarded_diff -= prev_index->events_discarded; /* * Deal with 32-bit wrap-around if the tracer provided a @@ -813,6 +837,17 @@ void ctf_update_current_packet_index(struct ctf_stream_definition *stream, if (prev_index->events_discarded_len == 32) { events_discarded_diff = (uint32_t) events_discarded_diff; } + } else { + /* + * First packet: use current packet info as limits for + * previous packet. + */ + stream->prev.cycles.begin = + stream->prev.cycles.end = + stream->current.cycles.begin; + stream->prev.real.begin = + stream->prev.real.end = + stream->current.real.begin; } stream->events_discarded = events_discarded_diff; } @@ -828,8 +863,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) struct ctf_file_stream *file_stream = container_of(pos, struct ctf_file_stream, pos); int ret; - off_t off; - struct packet_index *packet_index; + struct packet_index *packet_index, *prev_index; switch (whence) { case SEEK_CUR: @@ -839,7 +873,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) assert(0); } - if (pos->prot == PROT_WRITE && pos->content_size_loc) + if ((pos->prot & PROT_WRITE) && pos->content_size_loc) *pos->content_size_loc = pos->offset; if (pos->base_mma) { @@ -857,7 +891,7 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) * The caller should never ask for ctf_move_pos across packets, * except to get exactly at the beginning of the next packet. */ - if (pos->prot == PROT_WRITE) { + if (pos->prot & PROT_WRITE) { switch (whence) { case SEEK_CUR: /* The writer will add padding */ @@ -872,31 +906,21 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) } pos->content_size = -1U; /* Unknown at this point */ pos->packet_size = WRITE_PACKET_LEN; - off = posix_fallocate(pos->fd, pos->mmap_offset, - pos->packet_size / CHAR_BIT); - assert(off >= 0); + do { + ret = bt_posix_fallocate(pos->fd, pos->mmap_offset, + pos->packet_size / CHAR_BIT); + } while (ret == EINTR); + assert(ret == 0); pos->offset = 0; } else { read_next_packet: switch (whence) { case SEEK_CUR: { - struct packet_index *prev_index = NULL; - if (pos->offset == EOF) { return; } assert(pos->cur_index < pos->packet_index->len); - packet_index = &g_array_index(pos->packet_index, - struct packet_index, pos->cur_index); - if (pos->cur_index > 0) { - prev_index = &g_array_index(pos->packet_index, - struct packet_index, - pos->cur_index - 1); - } - ctf_update_current_packet_index(&file_stream->parent, - prev_index, packet_index); - /* The reader will expect us to skip padding */ ++pos->cur_index; break; @@ -906,44 +930,39 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) pos->offset = EOF; return; } - packet_index = &g_array_index(pos->packet_index, - struct packet_index, index); - pos->last_events_discarded = packet_index->events_discarded; pos->cur_index = index; - file_stream->parent.prev_real_timestamp = 0; - file_stream->parent.prev_real_timestamp_end = 0; - file_stream->parent.prev_cycles_timestamp = 0; - file_stream->parent.prev_cycles_timestamp_end = 0; break; default: assert(0); } + if (pos->cur_index >= pos->packet_index->len) { - /* - * We need to check if we are in trace read or - * called from packet indexing. In this last - * case, the collection is not there, so we - * cannot print the timestamps. - */ - if ((&file_stream->parent)->stream_class->trace->parent.collection) { - /* - * When a stream reaches the end of the - * file, we need to show the number of - * events discarded ourselves, because - * there is no next event scheduled to - * be printed in the output. - */ - if (file_stream->parent.events_discarded) { - fflush(stdout); - ctf_print_discarded(stderr, - &file_stream->parent, - 1); - file_stream->parent.events_discarded = 0; - } - } pos->offset = EOF; return; } + + packet_index = &g_array_index(pos->packet_index, + struct packet_index, pos->cur_index); + if (pos->cur_index > 0) { + prev_index = &g_array_index(pos->packet_index, + struct packet_index, + pos->cur_index - 1); + } else { + prev_index = NULL; + } + ctf_update_current_packet_index(&file_stream->parent, + prev_index, packet_index); + + /* + * We need to check if we are in trace read or called + * from packet indexing. In this last case, the + * collection is not there, so we cannot print the + * timestamps. + */ + if ((&file_stream->parent)->stream_class->trace->parent.collection) { + ctf_print_discarded(stderr, &file_stream->parent); + } + packet_index = &g_array_index(pos->packet_index, struct packet_index, pos->cur_index); @@ -984,12 +1003,14 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) } /* update trace_packet_header and stream_packet_context */ - if (pos->prot != PROT_WRITE && file_stream->parent.trace_packet_header) { + 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) { + 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); @@ -1049,7 +1070,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; @@ -1090,7 +1111,7 @@ int ctf_open_trace_metadata_packet_read(struct ctf_trace *td, FILE *in, memcpy(td->uuid, header.uuid, sizeof(header.uuid)); CTF_TRACE_SET_FIELD(td, uuid); } else { - if (babeltrace_uuid_compare(header.uuid, td->uuid)) + if (bt_uuid_compare(header.uuid, td->uuid)) return -EINVAL; } @@ -1139,7 +1160,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 +1179,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,10 +1220,8 @@ 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, - struct ctf_scanner *scanner) +int ctf_trace_metadata_read(struct ctf_trace *td, FILE *metadata_fp, + struct ctf_scanner *scanner, int append) { struct ctf_file_stream *metadata_stream; FILE *fp; @@ -1212,14 +1231,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,29 +1257,29 @@ 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; } 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 %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; + 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); } ret = ctf_scanner_append_ast(scanner, fp); @@ -1358,6 +1369,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) { @@ -1407,20 +1448,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: @@ -1566,7 +1597,7 @@ begin: elem = bt_array_index(defarray, i); uuidval[i] = bt_get_unsigned_int(elem); } - ret = babeltrace_uuid_compare(td->uuid, uuidval); + ret = bt_uuid_compare(td->uuid, uuidval); if (ret) { fprintf(stderr, "[error] Unique Universal Identifiers do not match.\n"); return -EINVAL; @@ -1803,9 +1834,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; @@ -1825,35 +1857,40 @@ int import_stream_packet_index(struct ctf_trace *td, goto error; } if (be32toh(index_hdr.index_major) != CTF_INDEX_MAJOR) { - fprintf(stderr, "[error] Incompatible index file %" PRIu64 - ".%" PRIu64 ", supported %d.%d\n", - be64toh(index_hdr.index_major), - be64toh(index_hdr.index_minor), CTF_INDEX_MAJOR, + fprintf(stderr, "[error] Incompatible index file %" PRIu32 + ".%" PRIu32 ", supported %d.%d\n", + be32toh(index_hdr.index_major), + be32toh(index_hdr.index_minor), CTF_INDEX_MAJOR, CTF_INDEX_MINOR); 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 */ @@ -1890,6 +1927,7 @@ int import_stream_packet_index(struct ctf_trace *td, ret = 0; error: + g_free(ctf_index); return ret; } @@ -1928,6 +1966,11 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, ret = 0; goto fd_is_dir_ok; } + if (!statbuf.st_size) { + /** Skip empty files. */ + ret = 0; + goto fd_is_empty_file; + } file_stream = g_new0(struct ctf_file_stream, 1); file_stream->pos.last_offset = LAST_OFFSET_POISON; @@ -1962,12 +2005,13 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, index_name = malloc((strlen(path) + sizeof(INDEX_PATH)) * sizeof(char)); if (!index_name) { fprintf(stderr, "[error] Cannot allocate index filename\n"); + ret = -ENOMEM; goto error_def; } snprintf(index_name, strlen(path) + sizeof(INDEX_PATH), INDEX_PATH, path); - if (faccessat(td->dirfd, index_name, O_RDONLY, flags) < 0) { + if (bt_faccessat(td->dirfd, td->parent.path, index_name, O_RDONLY, 0) < 0) { ret = create_stream_packet_index(td, file_stream); if (ret) { fprintf(stderr, "[error] Stream index creation error.\n"); @@ -2020,6 +2064,7 @@ error_def: fprintf(stderr, "Error on ctf_fini_pos\n"); } g_free(file_stream); +fd_is_empty_file: fd_is_dir_ok: fstat_error: closeret = close(fd); @@ -2065,6 +2110,8 @@ 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. */ scanner = ctf_scanner_alloc(); if (!scanner) { @@ -2072,10 +2119,12 @@ int ctf_open_trace_read(struct ctf_trace *td, ret = -ENOMEM; goto error_metadata; } - ret = ctf_open_trace_metadata_read(td, packet_seek, metadata_fp, - scanner); + ret = ctf_trace_metadata_read(td, metadata_fp, scanner, 0); ctf_scanner_free(scanner); if (ret) { + if (ret == -ENOENT) { + fprintf(stderr, "[warning] Empty metadata.\n"); + } fprintf(stderr, "[warning] Unable to open trace metadata for path \"%s\".\n", path); goto error_metadata; } @@ -2207,13 +2256,17 @@ void ctf_init_mmap_pos(struct ctf_stream_pos *pos, static int prepare_mmap_stream_definition(struct ctf_trace *td, - struct ctf_file_stream *file_stream) + struct ctf_file_stream *file_stream, + void (*packet_seek)(struct bt_stream_pos *pos, size_t index, + int whence)) { struct ctf_stream_declaration *stream; - uint64_t stream_id = 0; + uint64_t stream_id; int ret; - file_stream->parent.stream_id = stream_id; + /* Ask for the first packet to get the stream_id. */ + packet_seek(&file_stream->pos.parent, 0, SEEK_SET); + stream_id = file_stream->parent.stream_id; if (stream_id >= td->streams->len) { fprintf(stderr, "[error] Stream %" PRIu64 " is not declared " "in metadata.\n", stream_id); @@ -2243,6 +2296,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td, struct ctf_file_stream *file_stream; file_stream = g_new0(struct ctf_file_stream, 1); + file_stream->parent.stream_id = -1ULL; file_stream->pos.last_offset = LAST_OFFSET_POISON; ctf_init_mmap_pos(&file_stream->pos, mmap_info); @@ -2253,7 +2307,7 @@ int ctf_open_mmap_stream_read(struct ctf_trace *td, goto error_def; } - ret = prepare_mmap_stream_definition(td, file_stream); + ret = prepare_mmap_stream_definition(td, file_stream, packet_seek); if (ret) goto error_index; @@ -2284,17 +2338,18 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td, { int ret; struct bt_mmap_stream *mmap_info; - struct ctf_scanner *scanner; - scanner = ctf_scanner_alloc(); - if (!scanner) { + td->scanner = ctf_scanner_alloc(); + if (!td->scanner) { fprintf(stderr, "[error] Error allocating scanner\n"); ret = -ENOMEM; - goto error_scanner_alloc; + goto error; } - ret = ctf_open_trace_metadata_read(td, ctf_packet_seek, metadata_fp, - scanner); + ret = ctf_trace_metadata_read(td, metadata_fp, td->scanner, 0); if (ret) { + if (ret == -ENOENT) { + fprintf(stderr, "[warning] Empty metadata.\n"); + } goto error; } @@ -2309,12 +2364,10 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td, goto error; } } - ctf_scanner_free(scanner); return 0; error: - ctf_scanner_free(scanner); -error_scanner_alloc: + ctf_scanner_free(td->scanner); return ret; } @@ -2351,6 +2404,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) { @@ -2443,6 +2531,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) {