#include <babeltrace/context-internal.h>
#include <babeltrace/compat/uuid.h>
#include <babeltrace/endian.h>
+#include <babeltrace/error.h>
#include <babeltrace/trace-debug-info.h>
#include <babeltrace/ctf/ctf-index.h>
#include <inttypes.h>
* 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) ||
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;
case SEEK_SET: /* Fall-through */
break; /* OK */
default:
- assert(0);
+ ret = -1;
+ goto end;
}
if ((pos->prot & PROT_WRITE) && pos->content_size_loc)
if (ret) {
fprintf(stderr, "[error] Unable to unmap old base: %s.\n",
strerror(errno));
- assert(0);
+ ret = -1;
+ goto end;
}
pos->base_mma = NULL;
}
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;
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 */
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,
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
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;
goto read_next_packet;
} else {
pos->offset = EOF;
- return;
+ ret = 0;
+ goto end;
}
}
/* map new base. Need mapping length from header. */
ret = generic_rw(&pos->parent, &file_stream->parent.stream_packet_context->p);
assert(!ret);
}
+ ret = 0;
+end:
+ bt_packet_seek_set_error(ret);
}
static
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;
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) {
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 */
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 */
}
} 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 */
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;
/* 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.
*/
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) {
/*
}
}
- 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;
}
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';
/* 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 "
projects / babeltrace.git / blobdiff