void ctf_move_pos_slow(struct ctf_stream_pos *pos, size_t offset, int whence)
{
+ struct ctf_file_stream *file_stream =
+ container_of(pos, struct ctf_file_stream, pos);
int ret;
off_t off;
struct packet_index *index;
pos->mmap_offset = index->offset;
/* Lookup context/packet size in index */
+ file_stream->stream.timestamp = index->timestamp_begin;
pos->content_size = index->content_size;
pos->packet_size = index->packet_size;
if (index->data_offset < index->content_size)
- pos->offset = index->data_offset;
+ pos->offset = 0; /* will read headers */
else {
pos->offset = EOF;
return;
strerror(errno));
assert(0);
}
+
+ /* update trace_packet_header and stream_packet_context */
+ if (file_stream->stream.trace_packet_header) {
+ /* Read packet header */
+ ret = generic_rw(&pos->parent, &file_stream->stream.trace_packet_header->p);
+ assert(!ret);
+ }
+ if (file_stream->stream.stream_packet_context) {
+ /* Read packet context */
+ ret = generic_rw(&pos->parent, &file_stream->stream.stream_packet_context->p);
+ assert(!ret);
+ }
}
static
{
struct metadata_packet_header header;
size_t readlen, writelen, toread;
- char buf[4096];
+ char buf[4096 + 1]; /* + 1 for debug-mode \0 */
int ret = 0;
readlen = fread(&header, header_sizeof(header), 1, in);
return -EINVAL;
}
- toread = header.content_size / CHAR_BIT;
+ toread = (header.content_size / CHAR_BIT) - header_sizeof(header);
for (;;) {
- readlen = fread(buf, sizeof(char), min(sizeof(buf), toread), in);
+ readlen = fread(buf, sizeof(char), min(sizeof(buf) - 1, toread), in);
if (ferror(in)) {
ret = -EINVAL;
break;
}
if (babeltrace_debug) {
+ buf[readlen] = '\0';
fprintf(stdout, "[debug] metadata packet read: %s\n",
buf);
}
if (ret < 0)
return ret;
+ if (filestats.st_size < MAX_PACKET_HEADER_LEN / CHAR_BIT)
+ return -EINVAL;
+
for (pos->mmap_offset = 0; pos->mmap_offset < filestats.st_size; ) {
uint64_t stream_id = 0;
packet_index.offset = pos->mmap_offset;
packet_index.content_size = 0;
packet_index.packet_size = 0;
+ packet_index.timestamp_begin = 0;
+ packet_index.timestamp_end = 0;
/* read and check header, set stream id (and check) */
if (file_stream->stream.trace_packet_header) {
return -EINVAL;
}
file_stream->stream.stream_class = stream;
+ ret = create_stream_definitions(td, &file_stream->stream);
+ if (ret)
+ return ret;
}
first_packet = 0;
- ret = create_stream_definitions(td, &file_stream->stream);
- if (ret)
- return ret;
-
if (file_stream->stream.stream_packet_context) {
/* Read packet context */
ret = generic_rw(&pos->parent, &file_stream->stream.stream_packet_context->p);
/* Use content size if non-zero, else file size */
packet_index.packet_size = packet_index.content_size ? : filestats.st_size * CHAR_BIT;
}
+
+ /* read timestamp begin from header */
+ len_index = struct_declaration_lookup_field_index(file_stream->stream.stream_packet_context->declaration, g_quark_from_static_string("timestamp_begin"));
+ if (len_index >= 0) {
+ struct definition_integer *defint;
+ struct definition *field;
+
+ field = struct_definition_get_field_from_index(file_stream->stream.stream_packet_context, len_index);
+ assert(field->declaration->id == CTF_TYPE_INTEGER);
+ defint = container_of(field, struct definition_integer, p);
+ assert(defint->declaration->signedness == FALSE);
+ packet_index.timestamp_begin = defint->value._unsigned;
+ }
+
+ /* read timestamp end from header */
+ len_index = struct_declaration_lookup_field_index(file_stream->stream.stream_packet_context->declaration, g_quark_from_static_string("timestamp_end"));
+ if (len_index >= 0) {
+ struct definition_integer *defint;
+ struct definition *field;
+
+ field = struct_definition_get_field_from_index(file_stream->stream.stream_packet_context, len_index);
+ assert(field->declaration->id == CTF_TYPE_INTEGER);
+ defint = container_of(field, struct definition_integer, p);
+ assert(defint->declaration->signedness == FALSE);
+ packet_index.timestamp_end = defint->value._unsigned;
+ }
} else {
/* Use file size for packet size */
packet_index.content_size = filestats.st_size * CHAR_BIT;