X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fctf.c;h=5b6e3b90cf886e559b05cfb6fd1992e5805b6bef;hb=6730cff6c77ecfc1a11a2ed9deabc945d7818b95;hp=bc96212149c47260ca5af36b73fa4458c0ffe27e;hpb=80715793a0776d0bdcb8f04de68961086f8cd006;p=babeltrace.git diff --git a/formats/ctf/ctf.c b/formats/ctf/ctf.c index bc962121..5b6e3b90 100644 --- a/formats/ctf/ctf.c +++ b/formats/ctf/ctf.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -426,7 +427,6 @@ void print_uuid(FILE *fp, unsigned char *uuid) * consumer had time to extract them. We keep track of those gaps with the * packet sequence number in each packet. */ -static void ctf_print_discarded_lost(FILE *fp, struct ctf_stream_definition *stream) { if ((!stream->events_discarded && !stream->packets_lost) || @@ -483,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; @@ -1052,7 +1053,8 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) case SEEK_SET: /* Fall-through */ break; /* OK */ default: - assert(0); + ret = -1; + goto end; } if ((pos->prot & PROT_WRITE) && pos->content_size_loc) @@ -1064,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; } @@ -1084,7 +1087,8 @@ 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; @@ -1100,7 +1104,8 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) case SEEK_CUR: { if (pos->offset == EOF) { - return; + ret = 0; + goto end; } assert(pos->cur_index < pos->packet_index->len); /* The reader will expect us to skip padding */ @@ -1110,17 +1115,20 @@ 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; } pos->cur_index = index; break; default: - assert(0); + ret = -1; + goto end; } if (pos->cur_index >= pos->packet_index->len) { pos->offset = EOF; - return; + ret = 0; + goto end; } packet_index = &g_array_index(pos->packet_index, @@ -1135,6 +1143,12 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) 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 @@ -1156,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; @@ -1172,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. */ @@ -1197,6 +1221,9 @@ void ctf_packet_seek(struct bt_stream_pos *stream_pos, size_t index, int whence) ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p); assert(!ret); } + ret = 0; +end: + bt_packet_seek_set_error(ret); } static @@ -1683,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; @@ -1699,8 +1725,8 @@ begin: 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) { @@ -1818,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 */ @@ -1830,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 */ @@ -1887,9 +1913,9 @@ begin: } } 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 */ @@ -1899,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; @@ -1927,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. */ @@ -1950,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) { /* @@ -1983,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; } @@ -2170,6 +2184,7 @@ int ctf_open_file_stream_read(struct ctf_trace *td, const char *path, int flags, 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'; @@ -2472,6 +2487,10 @@ int prepare_mmap_stream_definition(struct ctf_trace *td, /* 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 "