X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=70f419022f9b4c91dfc4b2284f51ff59b5c1a70f;hb=2068d50bb02a85b287150fa80bafc4d3dfc80a40;hp=352efa89711facfff163105bb4f601c0d631a217;hpb=137723042cfd51e7c289fc96cf93739d83eca634;p=babeltrace.git diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c index 352efa89..70f41902 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.c +++ b/src/plugins/ctf/fs-src/data-stream-file.c @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include "compat/mman.h" @@ -48,7 +47,7 @@ static inline size_t remaining_mmap_bytes(struct ctf_fs_ds_file *ds_file) { - BT_ASSERT(ds_file->mmap_len >= ds_file->request_offset); + BT_ASSERT_DBG(ds_file->mmap_len >= ds_file->request_offset); return ds_file->mmap_len - ds_file->request_offset; } @@ -78,11 +77,11 @@ end: } static -enum bt_msg_iter_medium_status ds_file_mmap_next( +enum ctf_msg_iter_medium_status ds_file_mmap_next( struct ctf_fs_ds_file *ds_file) { - enum bt_msg_iter_medium_status ret = - BT_MSG_ITER_MEDIUM_STATUS_OK; + enum ctf_msg_iter_medium_status ret = + CTF_MSG_ITER_MEDIUM_STATUS_OK; /* Unmap old region */ if (ds_file->mmap_addr) { @@ -102,7 +101,7 @@ enum bt_msg_iter_medium_status ds_file_mmap_next( ds_file->mmap_len = MIN(ds_file->file->size - ds_file->mmap_offset, ds_file->mmap_max_len); if (ds_file->mmap_len == 0) { - ret = BT_MSG_ITER_MEDIUM_STATUS_EOF; + ret = CTF_MSG_ITER_MEDIUM_STATUS_EOF; goto end; } /* Map new region */ @@ -121,18 +120,18 @@ enum bt_msg_iter_medium_status ds_file_mmap_next( goto end; error: ds_file_munmap(ds_file); - ret = BT_MSG_ITER_MEDIUM_STATUS_ERROR; + ret = CTF_MSG_ITER_MEDIUM_STATUS_ERROR; end: return ret; } static -enum bt_msg_iter_medium_status medop_request_bytes( +enum ctf_msg_iter_medium_status medop_request_bytes( size_t request_sz, uint8_t **buffer_addr, size_t *buffer_sz, void *data) { - enum bt_msg_iter_medium_status status = - BT_MSG_ITER_MEDIUM_STATUS_OK; + enum ctf_msg_iter_medium_status status = + CTF_MSG_ITER_MEDIUM_STATUS_OK; struct ctf_fs_ds_file *ds_file = data; if (request_sz == 0) { @@ -148,15 +147,15 @@ enum bt_msg_iter_medium_status medop_request_bytes( if (ds_file->mmap_offset >= ds_file->file->size) { BT_COMP_LOGD("Reached end of file \"%s\" (%p)", ds_file->file->path->str, ds_file->file->fp); - status = BT_MSG_ITER_MEDIUM_STATUS_EOF; + status = CTF_MSG_ITER_MEDIUM_STATUS_EOF; goto end; } status = ds_file_mmap_next(ds_file); switch (status) { - case BT_MSG_ITER_MEDIUM_STATUS_OK: + case CTF_MSG_ITER_MEDIUM_STATUS_OK: break; - case BT_MSG_ITER_MEDIUM_STATUS_EOF: + case CTF_MSG_ITER_MEDIUM_STATUS_EOF: goto end; default: BT_COMP_LOGE("Cannot memory-map next region of file \"%s\" (%p)", @@ -173,7 +172,7 @@ enum bt_msg_iter_medium_status medop_request_bytes( goto end; error: - status = BT_MSG_ITER_MEDIUM_STATUS_ERROR; + status = CTF_MSG_ITER_MEDIUM_STATUS_ERROR; end: return status; @@ -205,20 +204,20 @@ end: } static -enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence, +enum ctf_msg_iter_medium_status medop_seek(enum ctf_msg_iter_seek_whence whence, off_t offset, void *data) { - enum bt_msg_iter_medium_status ret = - BT_MSG_ITER_MEDIUM_STATUS_OK; + enum ctf_msg_iter_medium_status ret = + CTF_MSG_ITER_MEDIUM_STATUS_OK; struct ctf_fs_ds_file *ds_file = data; off_t offset_in_mapping, file_size = ds_file->file->size; - if (whence != BT_MSG_ITER_SEEK_WHENCE_SET || + if (whence != CTF_MSG_ITER_SEEK_WHENCE_SET || offset < 0 || offset > file_size) { BT_COMP_LOGE("Invalid medium seek request: whence=%d, offset=%jd, " "file-size=%jd", (int) whence, (intmax_t) offset, (intmax_t) file_size); - ret = BT_MSG_ITER_MEDIUM_STATUS_INVAL; + ret = CTF_MSG_ITER_MEDIUM_STATUS_INVAL; goto end; } @@ -240,7 +239,7 @@ enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence, ds_file->mmap_len); unmap_ret = ds_file_munmap(ds_file); if (unmap_ret) { - ret = BT_MSG_ITER_MEDIUM_STATUS_ERROR; + ret = CTF_MSG_ITER_MEDIUM_STATUS_ERROR; goto end; } goto map_requested_offset; @@ -251,12 +250,12 @@ enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence, map_requested_offset: offset_in_mapping = offset % - bt_common_get_page_size(ds_file->log_level); + bt_mmap_get_offset_align_size(ds_file->log_level); ds_file->mmap_offset = offset - offset_in_mapping; ds_file->request_offset = offset_in_mapping; ret = ds_file_mmap_next(ds_file); - if (ret != BT_MSG_ITER_MEDIUM_STATUS_OK) { + if (ret != CTF_MSG_ITER_MEDIUM_STATUS_OK) { goto end; } @@ -267,7 +266,7 @@ end: } BT_HIDDEN -struct bt_msg_iter_medium_ops ctf_fs_ds_file_medops = { +struct ctf_msg_iter_medium_ops ctf_fs_ds_file_medops = { .request_bytes = medop_request_bytes, .borrow_stream = medop_borrow_stream, .seek = medop_seek, @@ -303,11 +302,12 @@ struct ctf_fs_ds_index *build_index_from_idx_file( size_t file_entry_count; size_t i; struct ctf_stream_class *sc; - struct bt_msg_iter_packet_properties props; + struct ctf_msg_iter_packet_properties props; + uint32_t version_major, version_minor; BT_COMP_LOGI("Building index from .idx file of stream file %s", ds_file->file->path->str); - ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props); + ret = ctf_msg_iter_get_packet_properties(ds_file->msg_iter, &props); if (ret) { BT_COMP_LOGI_STR("Cannot read first packet's header and context fields."); goto error; @@ -374,6 +374,16 @@ struct ctf_fs_ds_index *build_index_from_idx_file( goto error; } + version_major = be32toh(header->index_major); + version_minor = be32toh(header->index_minor); + if (version_major != 1) { + BT_COMP_LOGW( + "Unknown LTTng trace index version: " + "major=%" PRIu32 ", minor=%" PRIu32, + version_major, version_minor); + goto error; + } + file_index_entry_size = be32toh(header->packet_index_len); file_entry_count = (filesize - sizeof(*header)) / file_index_entry_size; if ((filesize - sizeof(*header)) % file_index_entry_size) { @@ -448,8 +458,11 @@ struct ctf_fs_ds_index *build_index_from_idx_file( total_packets_size += packet_size; file_pos += file_index_entry_size; - g_ptr_array_add(index->entries, index_entry); prev_index_entry = index_entry; + + /* Give ownership of `index_entry` to `index->entries`. */ + g_ptr_array_add(index->entries, index_entry); + index_entry = NULL; } /* Validate that the index addresses the complete stream. */ @@ -480,7 +493,7 @@ error: static int init_index_entry(struct ctf_fs_ds_index_entry *entry, struct ctf_fs_ds_file *ds_file, - struct bt_msg_iter_packet_properties *props, + struct ctf_msg_iter_packet_properties *props, off_t packet_size, off_t packet_offset) { int ret = 0; @@ -495,6 +508,8 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry, entry->packet_size = packet_size; if (props->snapshots.beginning_clock != UINT64_C(-1)) { + entry->timestamp_begin = props->snapshots.beginning_clock; + /* Convert the packet's bound to nanoseconds since Epoch. */ ret = convert_cycles_to_ns(sc->default_clock_class, props->snapshots.beginning_clock, @@ -504,10 +519,14 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry, goto end; } } else { + entry->timestamp_begin = UINT64_C(-1); entry->timestamp_begin_ns = UINT64_C(-1); } if (props->snapshots.end_clock != UINT64_C(-1)) { + entry->timestamp_end = props->snapshots.end_clock; + + /* Convert the packet's bound to nanoseconds since Epoch. */ ret = convert_cycles_to_ns(sc->default_clock_class, props->snapshots.end_clock, &entry->timestamp_end_ns); @@ -516,6 +535,7 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry, goto end; } } else { + entry->timestamp_end = UINT64_C(-1); entry->timestamp_end_ns = UINT64_C(-1); } @@ -530,7 +550,7 @@ struct ctf_fs_ds_index *build_index_from_stream_file( { int ret; struct ctf_fs_ds_index *index = NULL; - enum bt_msg_iter_status iter_status = BT_MSG_ITER_STATUS_OK; + enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK; off_t current_packet_offset_bytes = 0; BT_COMP_LOGI("Indexing stream file %s", ds_file->file->path->str); @@ -540,10 +560,10 @@ struct ctf_fs_ds_index *build_index_from_stream_file( goto error; } - do { + while (true) { off_t current_packet_size_bytes; struct ctf_fs_ds_index_entry *index_entry; - struct bt_msg_iter_packet_properties props; + struct ctf_msg_iter_packet_properties props; if (current_packet_offset_bytes < 0) { BT_COMP_LOGE_STR("Cannot get the current packet's offset."); @@ -556,15 +576,15 @@ struct ctf_fs_ds_index *build_index_from_stream_file( break; } - iter_status = bt_msg_iter_seek(ds_file->msg_iter, + iter_status = ctf_msg_iter_seek(ds_file->msg_iter, current_packet_offset_bytes); - if (iter_status != BT_MSG_ITER_STATUS_OK) { + if (iter_status != CTF_MSG_ITER_STATUS_OK) { goto error; } - iter_status = bt_msg_iter_get_packet_properties( + iter_status = ctf_msg_iter_get_packet_properties( ds_file->msg_iter, &props); - if (iter_status != BT_MSG_ITER_STATUS_OK) { + if (iter_status != CTF_MSG_ITER_STATUS_OK) { goto error; } @@ -610,11 +630,6 @@ struct ctf_fs_ds_index *build_index_from_stream_file( "next-packet-offset=%jd", (intmax_t) (current_packet_offset_bytes - current_packet_size_bytes), (intmax_t) current_packet_offset_bytes); - - } while (iter_status == BT_MSG_ITER_STATUS_OK); - - if (iter_status != BT_MSG_ITER_STATUS_OK) { - goto error; } end: @@ -630,12 +645,12 @@ BT_HIDDEN struct ctf_fs_ds_file *ctf_fs_ds_file_create( struct ctf_fs_trace *ctf_fs_trace, bt_self_message_iterator *pc_msg_iter, - struct bt_msg_iter *msg_iter, + struct ctf_msg_iter *msg_iter, bt_stream *stream, const char *path, bt_logging_level log_level) { int ret; - const size_t page_size = bt_common_get_page_size(log_level); + const size_t offset_align = bt_mmap_get_offset_align_size(log_level); struct ctf_fs_ds_file *ds_file = g_new0(struct ctf_fs_ds_file, 1); if (!ds_file) { @@ -644,7 +659,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( ds_file->log_level = log_level; ds_file->self_comp = ctf_fs_trace->self_comp; - ds_file->pc_msg_iter = pc_msg_iter; + ds_file->self_msg_iter = pc_msg_iter; ds_file->file = ctf_fs_file_create(log_level, ds_file->self_comp); if (!ds_file->file) { goto error; @@ -660,12 +675,12 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( } ds_file->msg_iter = msg_iter; - bt_msg_iter_set_medops_data(ds_file->msg_iter, ds_file); + ctf_msg_iter_set_medops_data(ds_file->msg_iter, ds_file); if (!ds_file->msg_iter) { goto error; } - ds_file->mmap_max_len = page_size * 2048; + ds_file->mmap_max_len = offset_align * 2048; goto end; @@ -747,28 +762,28 @@ bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next( struct ctf_fs_ds_file *ds_file, bt_message **msg) { - enum bt_msg_iter_status msg_iter_status; + enum ctf_msg_iter_status msg_iter_status; bt_component_class_message_iterator_next_method_status status; - msg_iter_status = bt_msg_iter_get_next_message( - ds_file->msg_iter, ds_file->pc_msg_iter, msg); + msg_iter_status = ctf_msg_iter_get_next_message( + ds_file->msg_iter, msg); switch (msg_iter_status) { - case BT_MSG_ITER_STATUS_EOF: + case CTF_MSG_ITER_STATUS_EOF: status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END; break; - case BT_MSG_ITER_STATUS_OK: + case CTF_MSG_ITER_STATUS_OK: status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK; break; - case BT_MSG_ITER_STATUS_AGAIN: + case CTF_MSG_ITER_STATUS_AGAIN: /* * Should not make it this far as this is * medium-specific; there is nothing for the user to do * and it should have been handled upstream. */ - abort(); - case BT_MSG_ITER_STATUS_INVAL: - case BT_MSG_ITER_STATUS_ERROR: + bt_common_abort(); + case CTF_MSG_ITER_STATUS_INVAL: + case CTF_MSG_ITER_STATUS_ERROR: default: status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR; break;