X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=5b6e3b90cf886e559b05cfb6fd1992e5805b6bef;hb=6730cff6c77ecfc1a11a2ed9deabc945d7818b95;hp=2ff68bbfa2650a8391aebf2d71c1c4bb97b38ca8;hpb=0c880b0af719e4d58ccebe61acdd0e77a4479bfd;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index 2ff68bbf..5b6e3b90 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -27,6 +27,7 @@ */ #include +#include #include #include #include @@ -35,6 +36,8 @@ #include #include #include +#include +#include #include #include #include @@ -53,6 +56,7 @@ #include "metadata/ctf-ast.h" #include "events-private.h" #include +#include #define LOG2_CHAR_BIT 3 @@ -66,10 +70,6 @@ */ #define WRITE_PACKET_LEN (getpagesize() * 8 * CHAR_BIT) -#ifndef min -#define min(a, b) (((a) < (b)) ? (a) : (b)) -#endif - #define NSEC_PER_SEC 1000000000ULL #define INDEX_PATH "./index/%s.idx" @@ -83,6 +83,15 @@ uint64_t opt_clock_offset; uint64_t opt_clock_offset_ns; extern int yydebug; +char *opt_debug_info_dir; +char *opt_debug_info_target_prefix; + +/* + * 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, @@ -279,10 +288,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 +304,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 +411,48 @@ 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 ] + * + * Lost packets occur if the tracer overwrote some subbuffer(s) before the + * consumer had time to extract them. We keep track of those gaps with the + * packet sequence number in each packet. + */ +void ctf_print_discarded_lost(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 && !stream->packets_lost) || + !babeltrace_ctf_console_output) { + return; + } + fflush(stdout); + if (stream->events_discarded) { + fprintf(fp, "[warning] Tracer discarded %" PRIu64 " events between [", + stream->events_discarded); + } else if (stream->packets_lost) { + fprintf(fp, "[warning] Tracer lost %" PRIu64 " trace packets between [", + stream->packets_lost); + } 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); @@ -456,7 +483,8 @@ int ctf_read_event(struct bt_stream_pos *ppos, struct ctf_stream_definition *str if (unlikely(pos->offset == EOF)) return EOF; - ctf_pos_get_event(pos); + if (ctf_pos_get_event(pos)) + return EOF; /* save the current position as a restore point */ pos->last_offset = pos->offset; @@ -747,7 +775,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 +791,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; @@ -786,26 +814,39 @@ void ctf_update_current_packet_index(struct ctf_stream_definition *stream, struct packet_index *cur_index) { uint64_t events_discarded_diff; + uint64_t packets_lost_diff = 0; /* 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; + /* packet_seq_num stays at 0 if not produced by the tracer */ + if (cur_index->packet_seq_num) { + packets_lost_diff = cur_index->packet_seq_num - + prev_index->packet_seq_num - 1; + } /* * Deal with 32-bit wrap-around if the tracer provided a * 32-bit field. @@ -813,8 +854,185 @@ 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; + stream->packets_lost = packets_lost_diff; +} + +/* + * Find the timerange where all the streams in the trace are active + * simultaneously. + * + * Return 0 and update begin/end if necessary on success, return 1 for + * empty streams and return a negative value on error. + */ +static +int ctf_find_stream_intersection(struct bt_trace_descriptor *td_read, + struct packet_index_time *_real, + struct packet_index_time *_cycles) +{ + int stream_id, ret = 0; + struct packet_index_time real = { 0, UINT64_MAX }, + cycles = { 0, UINT64_MAX }; + struct ctf_trace *tin = container_of(td_read, struct ctf_trace, parent); + + /* At least one of the two return args must be provided. */ + if (!_real && !_cycles) { + ret = -1; + goto end; + } + + if (tin->streams->len == 0) { + ret = 1; + goto end; + } + + for (stream_id = 0; stream_id < tin->streams->len; + stream_id++) { + int filenr; + struct ctf_stream_declaration *stream_class; + + stream_class = g_ptr_array_index(tin->streams, stream_id); + if (!stream_class) { + continue; + } + for (filenr = 0; filenr < stream_class->streams->len; filenr++) { + struct ctf_file_stream *file_stream; + struct ctf_stream_pos *stream_pos; + struct packet_index *index; + + file_stream = g_ptr_array_index(stream_class->streams, + filenr); + if (!file_stream) { + continue; + } + stream_pos = &file_stream->pos; + if (!stream_pos->packet_index || + stream_pos->packet_index->len <= 0) { + ret = 1; + goto end; + } + index = &g_array_index(stream_pos->packet_index, + struct packet_index, 0); + real.timestamp_begin = max(real.timestamp_begin, + index->ts_real.timestamp_begin); + cycles.timestamp_begin = max(cycles.timestamp_begin, + index->ts_cycles.timestamp_begin); + + index = &g_array_index(stream_pos->packet_index, + struct packet_index, + stream_pos->packet_index->len - 1); + real.timestamp_end = min(real.timestamp_end, + index->ts_real.timestamp_end); + cycles.timestamp_end = min(cycles.timestamp_end, + index->ts_cycles.timestamp_end); + } + } +end: + if (ret == 0) { + if (_real) { + *_real = real; + } + if (_cycles) { + *_cycles = cycles; + } + } + return ret; +} + +/* + * Find the union of all active regions in the trace collection's traces. + * Returns "real" timestamps. + * + * Return 0 on success. + * Return 1 if no intersections are found. + * Return a negative value on error. + */ +int ctf_find_tc_stream_packet_intersection_union(struct bt_context *ctx, + uint64_t *_ts_begin, uint64_t *_ts_end) +{ + int ret = 0, i; + uint64_t ts_begin = UINT64_MAX, ts_end = 0; + + if (!ctx || !ctx->tc || !ctx->tc->array || !_ts_begin || !_ts_end) { + ret = -EINVAL; + goto end; + } + + for (i = 0; i < ctx->tc->array->len; i++) { + struct bt_trace_descriptor *td_read; + struct packet_index_time intersection_real; + + td_read = g_ptr_array_index(ctx->tc->array, i); + if (!td_read) { + continue; + } + ret = ctf_find_stream_intersection(td_read, &intersection_real, + NULL); + if (ret == 1) { + /* Empty trace or no stream intersection. */ + continue; + } else if (ret < 0) { + goto end; + } + + ts_begin = min(intersection_real.timestamp_begin, ts_begin); + ts_end = max(intersection_real.timestamp_end, ts_end); + } + + if (ts_end < ts_begin) { + ret = 1; + goto end; + } + *_ts_begin = ts_begin; + *_ts_end = ts_end; +end: + return ret; +} + +int ctf_tc_set_stream_intersection_mode(struct bt_context *ctx) +{ + int ret = 0, i; + + if (!ctx || !ctx->tc || !ctx->tc->array) { + ret = -EINVAL; + goto end; + } + + for (i = 0; i < ctx->tc->array->len; i++) { + struct bt_trace_descriptor *td_read; + struct packet_index_time intersection_real; + + td_read = g_ptr_array_index(ctx->tc->array, i); + if (!td_read) { + continue; + } + + ret = ctf_find_stream_intersection(td_read, &intersection_real, + NULL); + if (ret == 1) { + /* Empty trace or no stream intersection. */ + continue; + } else if (ret < 0) { + goto end; + } + + td_read->interval_real = intersection_real; + td_read->interval_set = true; + } +end: + return ret; } /* @@ -828,18 +1046,18 @@ 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: case SEEK_SET: /* Fall-through */ break; /* OK */ default: - assert(0); + ret = -1; + goto end; } - 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) { @@ -848,7 +1066,8 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) if (ret) { fprintf(stderr, "[error] Unable to unmap old base: %s.\n", strerror(errno)); - assert(0); + ret = -1; + goto end; } pos->base_mma = NULL; } @@ -857,7 +1076,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 */ @@ -868,35 +1087,27 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) pos->cur_index = 0; break; default: - assert(0); + ret = -1; + goto end; } 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; + ret = 0; + goto end; } 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; @@ -904,46 +1115,50 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) case SEEK_SET: if (index >= pos->packet_index->len) { pos->offset = EOF; - return; + ret = 0; + goto end; } - 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); + ret = -1; + goto end; } + 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; + ret = 0; + goto end; } + + 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); + + if (pos->cur_index >= pos->packet_index->len) { + pos->offset = EOF; + ret = 0; + goto end; + } + + /* + * 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_lost(stderr, &file_stream->parent); + } + packet_index = &g_array_index(pos->packet_index, struct packet_index, pos->cur_index); @@ -955,9 +1170,18 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) if (packet_index->data_offset == -1) { ret = find_data_offset(pos, file_stream, packet_index); if (ret < 0) { - return; + ret = -1; + goto end; } } + + if (packet_index->packet_size > ((uint64_t) pos->file_length - packet_index->offset) * CHAR_BIT) { + fprintf(stderr, "[error] Packet size (%" PRIu64 " bits) is larger than remaining file size (%" PRIu64 " bits).\n", + packet_index->packet_size, ((uint64_t) pos->file_length - packet_index->offset) * CHAR_BIT); + ret = -1; + goto end; + } + pos->content_size = packet_index->content_size; pos->packet_size = packet_index->packet_size; pos->mmap_offset = packet_index->offset; @@ -971,7 +1195,8 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) goto read_next_packet; } else { pos->offset = EOF; - return; + ret = 0; + goto end; } } /* map new base. Need mapping length from header. */ @@ -984,16 +1209,21 @@ 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); } + ret = 0; +end: + bt_packet_seek_set_error(ret); } static @@ -1090,7 +1320,7 @@ int ctf_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; } @@ -1238,8 +1468,6 @@ int ctf_trace_metadata_read(struct ctf_trace *td, FILE *metadata_fp, if (packet_metadata(td, fp)) { 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; @@ -1482,8 +1710,7 @@ int stream_assign_class(struct ctf_trace *td, static int create_stream_one_packet_index(struct ctf_stream_pos *pos, struct ctf_trace *td, - struct ctf_file_stream *file_stream, - size_t filesize) + struct ctf_file_stream *file_stream) { struct packet_index packet_index; uint64_t stream_id = 0; @@ -1493,12 +1720,13 @@ int create_stream_one_packet_index(struct ctf_stream_pos *pos, int ret; begin: + memset(&packet_index, 0, sizeof(packet_index)); if (!pos->mmap_offset) { first_packet = 1; } - if (filesize - pos->mmap_offset < (packet_map_len >> LOG2_CHAR_BIT)) { - packet_map_len = (filesize - pos->mmap_offset) << LOG2_CHAR_BIT; + if (pos->file_length - pos->mmap_offset < (packet_map_len >> LOG2_CHAR_BIT)) { + packet_map_len = (pos->file_length - pos->mmap_offset) << LOG2_CHAR_BIT; } if (pos->base_mma) { @@ -1524,14 +1752,6 @@ begin: pos->offset = 0; /* Position of the packet header */ packet_index.offset = pos->mmap_offset; - packet_index.content_size = 0; - packet_index.packet_size = 0; - packet_index.ts_real.timestamp_begin = 0; - packet_index.ts_real.timestamp_end = 0; - packet_index.ts_cycles.timestamp_begin = 0; - packet_index.ts_cycles.timestamp_end = 0; - packet_index.events_discarded = 0; - packet_index.events_discarded_len = 0; /* read and check header, set stream id (and check) */ if (file_stream->parent.trace_packet_header) { @@ -1578,7 +1798,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; @@ -1624,7 +1844,7 @@ begin: packet_index.packet_size = bt_get_unsigned_int(field); } else { /* Use file size for packet size */ - packet_index.packet_size = filesize * CHAR_BIT; + packet_index.packet_size = pos->file_length * CHAR_BIT; } /* read content size from header */ @@ -1636,7 +1856,7 @@ begin: packet_index.content_size = bt_get_unsigned_int(field); } else { /* Use packet size if non-zero, else file size */ - packet_index.content_size = packet_index.packet_size ? : filesize * CHAR_BIT; + packet_index.content_size = packet_index.packet_size ? : pos->file_length * CHAR_BIT; } /* read timestamp begin from header */ @@ -1678,11 +1898,24 @@ begin: packet_index.events_discarded = bt_get_unsigned_int(field); packet_index.events_discarded_len = bt_get_int_len(field); } + + /* read packet_seq_num from header */ + len_index = bt_struct_declaration_lookup_field_index( + file_stream->parent.stream_packet_context->declaration, + g_quark_from_static_string("packet_seq_num")); + if (len_index >= 0) { + struct bt_definition *field; + + field = bt_struct_definition_get_field_from_index( + file_stream->parent.stream_packet_context, + len_index); + packet_index.packet_seq_num = bt_get_unsigned_int(field); + } } else { /* Use file size for packet size */ - packet_index.packet_size = filesize * CHAR_BIT; + packet_index.packet_size = pos->file_length * CHAR_BIT; /* Use packet size if non-zero, else file size */ - packet_index.content_size = packet_index.packet_size ? : filesize * CHAR_BIT; + packet_index.content_size = packet_index.packet_size ? : pos->file_length * CHAR_BIT; } /* Validate content size and packet size values */ @@ -1692,12 +1925,6 @@ begin: return -EINVAL; } - if (packet_index.packet_size > ((uint64_t) filesize - packet_index.offset) * CHAR_BIT) { - fprintf(stderr, "[error] Packet size (%" PRIu64 " bits) is larger than remaining file size (%" PRIu64 " bits).\n", - packet_index.packet_size, ((uint64_t) filesize - packet_index.offset) * CHAR_BIT); - return -EINVAL; - } - if (packet_index.content_size < pos->offset) { fprintf(stderr, "[error] Invalid CTF stream: content size is smaller than packet headers.\n"); return -EINVAL; @@ -1720,7 +1947,7 @@ begin: /* Retry with larger mapping */ retry: - if (packet_map_len == ((filesize - pos->mmap_offset) << LOG2_CHAR_BIT)) { + if (packet_map_len == ((pos->file_length - pos->mmap_offset) << LOG2_CHAR_BIT)) { /* * Reached EOF, but still expecting header/context data. */ @@ -1743,17 +1970,12 @@ int create_stream_packet_index(struct ctf_trace *td, struct ctf_file_stream *file_stream) { struct ctf_stream_pos *pos; - struct stat filestats; int ret; pos = &file_stream->pos; - ret = fstat(pos->fd, &filestats); - if (ret < 0) - return ret; - /* Deal with empty files */ - if (!filestats.st_size) { + if (!pos->file_length) { if (file_stream->parent.trace_packet_header || file_stream->parent.stream_packet_context) { /* @@ -1776,9 +1998,8 @@ int create_stream_packet_index(struct ctf_trace *td, } } - for (pos->mmap_offset = 0; pos->mmap_offset < filestats.st_size; ) { - ret = create_stream_one_packet_index(pos, td, file_stream, - filestats.st_size); + for (pos->mmap_offset = 0; pos->mmap_offset < pos->file_length; ) { + ret = create_stream_one_packet_index(pos, td, file_stream); if (ret) return ret; } @@ -1815,9 +2036,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, index_minor; int ret = 0; int first_packet = 1; size_t len; @@ -1837,35 +2059,46 @@ 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) { + index_minor = be32toh(index_hdr.index_minor); + + 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 (index_minor >= 1) { + index.stream_instance_id = be64toh(ctf_index->stream_instance_id); + index.packet_seq_num = be64toh(ctf_index->packet_seq_num); + } if (!first_packet) { /* add index to packet array */ @@ -1902,6 +2135,7 @@ int import_stream_packet_index(struct ctf_trace *td, ret = 0; error: + g_free(ctf_index); return ret; } @@ -1940,11 +2174,17 @@ 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; file_stream->pos.fd = -1; file_stream->pos.index_fp = NULL; + file_stream->pos.file_length = statbuf.st_size; strncpy(file_stream->parent.path, path, PATH_MAX); file_stream->parent.path[PATH_MAX - 1] = '\0'; @@ -1974,12 +2214,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"); @@ -2032,6 +2273,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); @@ -2089,6 +2331,9 @@ int ctf_open_trace_read(struct ctf_trace *td, 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; } @@ -2171,6 +2416,10 @@ struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags, packet_seek = ctf_packet_seek; td = g_new0(struct ctf_trace, 1); + if (!td) { + goto error; + } + init_trace_descriptor(&td->parent); switch (flags & O_ACCMODE) { case O_RDONLY: @@ -2190,9 +2439,17 @@ struct bt_trace_descriptor *ctf_open_trace(const char *path, int flags, goto error; } + ret = trace_debug_info_create(td); + if (ret) { + goto error; + } + return &td->parent; error: - g_free(td); + if (td) { + trace_debug_info_destroy(td); + g_free(td); + } return NULL; } @@ -2220,13 +2477,21 @@ 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); + ret = bt_packet_seek_get_error(); + if (ret) { + goto end; + } + 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); @@ -2256,6 +2521,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); @@ -2266,7 +2532,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; @@ -2306,6 +2572,9 @@ int ctf_open_mmap_trace_read(struct ctf_trace *td, } ret = ctf_trace_metadata_read(td, metadata_fp, td->scanner, 0); if (ret) { + if (ret == -ENOENT) { + fprintf(stderr, "[warning] Empty metadata.\n"); + } goto error; } @@ -2352,6 +2621,11 @@ struct bt_trace_descriptor *ctf_open_mmap_trace( if (ret) goto error_free; + ret = trace_debug_info_create(td); + if (ret) { + goto error_free; + } + return &td->parent; error_free: @@ -2503,6 +2777,7 @@ int ctf_close_trace(struct bt_trace_descriptor *tdp) } } free(td->metadata_string); + trace_debug_info_destroy(td); g_free(td); return 0; }