X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs%2Fdata-stream.c;h=ceeefdf5cf2b23768fddea02f79583889fe21eab;hb=b2e0c9076135f47110af2d96dfaee397c597bc90;hp=ca5b47e8d3383064b72b7d44277891cf3a7457a6;hpb=9fa0891acd0694a596cf8d3df18cd9615f409590;p=babeltrace.git diff --git a/plugins/ctf/fs/data-stream.c b/plugins/ctf/fs/data-stream.c index ca5b47e8..ceeefdf5 100644 --- a/plugins/ctf/fs/data-stream.c +++ b/plugins/ctf/fs/data-stream.c @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include "file.h" #include "metadata.h" #include "../common/notif-iter/notif-iter.h" @@ -66,9 +66,10 @@ end: } static -int mmap_next(struct ctf_fs_stream *stream) +enum bt_ctf_notif_iter_medium_status mmap_next(struct ctf_fs_stream *stream) { - int ret = 0; + enum bt_ctf_notif_iter_medium_status ret = + BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK; struct ctf_fs_component *ctf_fs = stream->file->ctf_fs; /* Unmap old region */ @@ -83,10 +84,15 @@ int mmap_next(struct ctf_fs_stream *stream) stream->mmap_valid_len = MIN(stream->file->size - stream->mmap_offset, stream->mmap_max_len); + if (stream->mmap_valid_len == 0) { + ret = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF; + goto end; + } /* Round up to next page, assuming page size being a power of 2. */ stream->mmap_len = (stream->mmap_valid_len + ctf_fs->page_size - 1) & ~(ctf_fs->page_size - 1); /* Map new region */ + assert(stream->mmap_len); stream->mmap_addr = mmap((void *) 0, stream->mmap_len, PROT_READ, MAP_PRIVATE, fileno(stream->file->fp), stream->mmap_offset); @@ -101,7 +107,7 @@ int mmap_next(struct ctf_fs_stream *stream) goto end; error: stream_munmap(stream); - ret = -1; + ret = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR; end: return ret; } @@ -123,16 +129,23 @@ enum bt_ctf_notif_iter_medium_status medop_request_bytes( /* Check if we have at least one memory-mapped byte left */ if (remaining_mmap_bytes(stream) == 0) { /* Are we at the end of the file? */ - if (stream->request_offset >= stream->file->size) { + if (stream->mmap_offset >= stream->file->size) { PDBG("Reached end of file \"%s\" (%p)\n", stream->file->path->str, stream->file->fp); status = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF; goto end; } - if (mmap_next(stream)) { + status = mmap_next(stream); + switch (status) { + case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK: + break; + case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF: + goto end; + default: PERR("Cannot memory-map next region of file \"%s\" (%p)\n", - stream->file->path->str, stream->file->fp); + stream->file->path->str, + stream->file->fp); goto error; } } @@ -176,10 +189,168 @@ static struct bt_ctf_notif_iter_medium_ops medops = { .get_stream = medop_get_stream, }; +static +int build_index_from_idx_file(struct ctf_fs_stream *stream) +{ + int ret = 0; + gchar *directory = NULL; + gchar *basename = NULL; + GString *index_basename = NULL; + gchar *index_file_path = NULL; + GMappedFile *mapped_file = NULL; + gsize filesize; + const struct ctf_packet_index_file_hdr *header; + const char *mmap_begin, *file_pos; + struct index_entry *index; + uint64_t total_packets_size = 0; + size_t file_index_entry_size; + size_t file_entry_count; + size_t i; + + /* Look for index file in relative path index/name.idx. */ + basename = g_path_get_basename(stream->file->path->str); + if (!basename) { + ret = -1; + goto end; + } + + directory = g_path_get_dirname(stream->file->path->str); + if (!directory) { + ret = -1; + goto end; + } + + index_basename = g_string_new(basename); + if (!index_basename) { + ret = -1; + goto end; + } + + g_string_append(index_basename, ".idx"); + index_file_path = g_build_filename(directory, "index", + index_basename->str, NULL); + mapped_file = g_mapped_file_new(index_file_path, FALSE, NULL); + if (!mapped_file) { + ret = -1; + goto end; + } + filesize = g_mapped_file_get_length(mapped_file); + if (filesize < sizeof(*header)) { + printf_error("Invalid LTTng trace index: file size < header size"); + ret = -1; + goto end; + } + + mmap_begin = g_mapped_file_get_contents(mapped_file); + header = (struct ctf_packet_index_file_hdr *) mmap_begin; + + file_pos = g_mapped_file_get_contents(mapped_file) + sizeof(*header); + if (be32toh(header->magic) != CTF_INDEX_MAGIC) { + printf_error("Invalid LTTng trace index: \"magic\" validation failed"); + ret = -1; + goto end; + } + + file_index_entry_size = be32toh(header->packet_index_len); + file_entry_count = (filesize - sizeof(*header)) / file_index_entry_size; + if ((filesize - sizeof(*header)) % (file_entry_count * file_index_entry_size)) { + printf_error("Invalid index file size; not a multiple of index entry size"); + ret = -1; + goto end; + } + + stream->index.entries = g_array_sized_new(FALSE, TRUE, + sizeof(struct index_entry), file_entry_count); + if (!stream->index.entries) { + ret = -1; + goto end; + } + index = (struct index_entry *) stream->index.entries->data; + for (i = 0; i < file_entry_count; i++) { + struct ctf_packet_index *file_index = + (struct ctf_packet_index *) file_pos; + uint64_t packet_size = be64toh(file_index->packet_size); + + if (packet_size % CHAR_BIT) { + ret = -1; + printf_error("Invalid packet size encountered in index file"); + goto invalid_index; + } + + /* Convert size in bits to bytes. */ + packet_size /= CHAR_BIT; + index->packet_size = packet_size; + + index->offset = be64toh(file_index->offset); + if (i != 0 && index->offset < (index - 1)->offset) { + printf_error("Invalid, non-monotonic, packet offset encountered in index file"); + ret = -1; + goto invalid_index; + } + + index->timestamp_begin = be64toh(file_index->timestamp_begin); + index->timestamp_end = be64toh(file_index->timestamp_end); + if (index->timestamp_end < index->timestamp_begin) { + printf_error("Invalid packet time bounds encountered in index file"); + ret = -1; + goto invalid_index; + } + + total_packets_size += packet_size; + file_pos += file_index_entry_size; + index++; + } + + /* Validate that the index addresses the complete stream. */ + if (stream->file->size != total_packets_size) { + printf_error("Invalid index; indexed size != stream file size"); + ret = -1; + goto invalid_index; + } +end: + g_free(directory); + g_free(basename); + g_free(index_file_path); + if (index_basename) { + g_string_free(index_basename, TRUE); + } + if (mapped_file) { + g_mapped_file_unref(mapped_file); + } + return ret; +invalid_index: + g_array_free(stream->index.entries, TRUE); + goto end; +} + +static +int build_index_from_stream(struct ctf_fs_stream *stream) +{ + int ret = 0; +end: + return ret; +} + +static +int init_stream_index(struct ctf_fs_stream *stream) +{ + int ret; + + ret = build_index_from_idx_file(stream); + if (!ret) { + goto end; + } + + ret = build_index_from_stream(stream); +end: + return ret; +} + BT_HIDDEN struct ctf_fs_stream *ctf_fs_stream_create( struct ctf_fs_component *ctf_fs, struct ctf_fs_file *file) { + int ret; struct ctf_fs_stream *stream = g_new0(struct ctf_fs_stream, 1); if (!stream) { @@ -194,6 +365,10 @@ struct ctf_fs_stream *ctf_fs_stream_create( } stream->mmap_max_len = ctf_fs->page_size * 2048; + ret = init_stream_index(stream); + if (ret) { + goto error; + } goto end; error: /* Do not touch "borrowed" file. */ @@ -223,5 +398,9 @@ void ctf_fs_stream_destroy(struct ctf_fs_stream *stream) bt_ctf_notif_iter_destroy(stream->notif_iter); } + if (stream->index.entries) { + g_array_free(stream->index.entries, TRUE); + } + g_free(stream); }