X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=99d3b472b58838fa884750bd0f4cbe66cd207d37;hb=ca63358821e899808105139f157acf9a113ac392;hp=3c4b0bfe67710776a9524d6d5dc6325e72020d94;hpb=4cdfc5e86b64137d96c31495cbdea99801714c2b;p=babeltrace.git diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 3c4b0bfe..99d3b472 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -29,14 +29,14 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include "file.h" #include "metadata.h" #include "../common/msg-iter/msg-iter.h" -#include +#include #include "data-stream-file.h" #include @@ -173,8 +173,7 @@ end: } static -bt_stream *medop_borrow_stream( - bt_stream_class *stream_class, int64_t stream_id, +bt_stream *medop_borrow_stream(bt_stream_class *stream_class, int64_t stream_id, void *data) { struct ctf_fs_ds_file *ds_file = data; @@ -199,9 +198,8 @@ end: } static -enum bt_msg_iter_medium_status medop_seek( - enum bt_msg_iter_seek_whence whence, off_t offset, - void *data) +enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence, + off_t offset, void *data) { enum bt_msg_iter_medium_status ret = BT_MSG_ITER_MEDIUM_STATUS_OK; @@ -259,45 +257,12 @@ struct bt_msg_iter_medium_ops ctf_fs_ds_file_medops = { }; static -struct ctf_fs_ds_index *ctf_fs_ds_index_create(size_t length) -{ - struct ctf_fs_ds_index *index = g_new0(struct ctf_fs_ds_index, 1); - - if (!index) { - BT_LOGE_STR("Failed to allocate index"); - goto error; - } - - index->entries = g_array_sized_new(FALSE, TRUE, - sizeof(struct ctf_fs_ds_index_entry), length); - if (!index->entries) { - BT_LOGE("Failed to allocate %zu index entries.", length); - goto error; - } - g_array_set_size(index->entries, length); -end: - return index; -error: - ctf_fs_ds_index_destroy(index); - goto end; -} - -/* Returns a new, zeroed, index entry. */ -static -struct ctf_fs_ds_index_entry *ctf_fs_ds_index_add_new_entry( - struct ctf_fs_ds_index *index) -{ - g_array_set_size(index->entries, index->entries->len + 1); - return &g_array_index(index->entries, struct ctf_fs_ds_index_entry, - index->entries->len - 1); -} - -static -int convert_cycles_to_ns(bt_clock_class *clock_class, +int convert_cycles_to_ns(struct ctf_clock_class *clock_class, uint64_t cycles, int64_t *ns) { - return bt_clock_class_cycles_to_ns_from_origin(clock_class, cycles, - ns); + return bt_util_clock_cycles_to_ns_from_origin(cycles, + clock_class->frequency, clock_class->offset_seconds, + clock_class->offset_cycles, ns); } static @@ -324,17 +289,12 @@ struct ctf_fs_ds_index *build_index_from_idx_file( BT_LOGD("Building index from .idx file of stream file %s", ds_file->file->path->str); - - ret = bt_msg_iter_borrow_packet_header_context_fields( - ds_file->msg_iter, NULL, NULL); + ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props); if (ret) { - BT_LOGD_STR("Cannot borrow first packet's header and context " - "fields."); + BT_LOGD_STR("Cannot read first packet's header and context fields."); goto error; } - ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props); - BT_ASSERT(ret == 0); sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, props.stream_class_id); BT_ASSERT(sc); @@ -406,13 +366,11 @@ struct ctf_fs_ds_index *build_index_from_idx_file( goto error; } - index = ctf_fs_ds_index_create(file_entry_count); + index = ctf_fs_ds_index_create(); if (!index) { goto error; } - index_entry = (struct ctf_fs_ds_index_entry *) &g_array_index( - index->entries, struct ctf_fs_ds_index_entry, 0); for (i = 0; i < file_entry_count; i++) { struct ctf_packet_index *file_index = (struct ctf_packet_index *) file_pos; @@ -423,6 +381,11 @@ struct ctf_fs_ds_index *build_index_from_idx_file( goto error; } + index_entry = g_new0(struct ctf_fs_ds_index_entry, 1); + if (!index_entry) { + goto error; + } + /* Convert size in bits to bytes. */ packet_size /= CHAR_BIT; index_entry->packet_size = packet_size; @@ -463,7 +426,8 @@ struct ctf_fs_ds_index *build_index_from_idx_file( total_packets_size += packet_size; file_pos += file_index_entry_size; - index_entry++; + + g_ptr_array_add(index->entries, index_entry); } /* Validate that the index addresses the complete stream. */ @@ -486,6 +450,7 @@ end: return index; error: ctf_fs_ds_index_destroy(index); + g_free(index_entry); index = NULL; goto end; } @@ -496,7 +461,7 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry, struct bt_msg_iter_packet_properties *props, off_t packet_size, off_t packet_offset) { - int ret; + int ret = 0; struct ctf_stream_class *sc; sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, @@ -507,21 +472,29 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry, BT_ASSERT(packet_size >= 0); entry->packet_size = packet_size; - /* Convert the packet's bound to nanoseconds since Epoch. */ - ret = convert_cycles_to_ns(sc->default_clock_class, - props->snapshots.beginning_clock, - &entry->timestamp_begin_ns); - if (ret) { - BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch."); - goto end; + if (props->snapshots.beginning_clock != UINT64_C(-1)) { + /* Convert the packet's bound to nanoseconds since Epoch. */ + ret = convert_cycles_to_ns(sc->default_clock_class, + props->snapshots.beginning_clock, + &entry->timestamp_begin_ns); + if (ret) { + BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch."); + goto end; + } + } else { + entry->timestamp_begin_ns = UINT64_C(-1); } - ret = convert_cycles_to_ns(sc->default_clock_class, - props->snapshots.end_clock, - &entry->timestamp_end_ns); - if (ret) { - BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch."); - goto end; + if (props->snapshots.end_clock != UINT64_C(-1)) { + ret = convert_cycles_to_ns(sc->default_clock_class, + props->snapshots.end_clock, + &entry->timestamp_end_ns); + if (ret) { + BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch."); + goto end; + } + } else { + entry->timestamp_end_ns = UINT64_C(-1); } end: @@ -534,81 +507,87 @@ 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; + enum bt_msg_iter_status iter_status = BT_MSG_ITER_STATUS_OK; + off_t current_packet_offset_bytes = 0; BT_LOGD("Indexing stream file %s", ds_file->file->path->str); - index = ctf_fs_ds_index_create(0); + index = ctf_fs_ds_index_create(); if (!index) { goto error; } do { - off_t current_packet_offset; - off_t next_packet_offset; off_t current_packet_size_bytes; - struct ctf_fs_ds_index_entry *entry; + struct ctf_fs_ds_index_entry *index_entry; struct bt_msg_iter_packet_properties props; - iter_status = bt_msg_iter_borrow_packet_header_context_fields( - ds_file->msg_iter, NULL, NULL); - if (iter_status != BT_MSG_ITER_STATUS_OK) { - if (iter_status == BT_MSG_ITER_STATUS_EOF) { - break; - } + if (current_packet_offset_bytes < 0) { + BT_LOGE_STR("Cannot get the current packet's offset."); goto error; + } else if (current_packet_offset_bytes > ds_file->file->size) { + BT_LOGE_STR("Unexpected current packet's offset (larger than file)."); + goto error; + } else if (current_packet_offset_bytes == ds_file->file->size) { + /* No more data */ + break; } - ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, - &props); - BT_ASSERT(ret == 0); + iter_status = bt_msg_iter_seek(ds_file->msg_iter, + current_packet_offset_bytes); + if (iter_status != BT_MSG_ITER_STATUS_OK) { + goto error; + } - current_packet_offset = - bt_msg_iter_get_current_packet_offset( - ds_file->msg_iter); - if (current_packet_offset < 0) { - BT_LOGE_STR("Cannot get the current packet's offset."); + iter_status = bt_msg_iter_get_packet_properties( + ds_file->msg_iter, &props); + if (iter_status != BT_MSG_ITER_STATUS_OK) { goto error; } - current_packet_size_bytes = - ((props.exp_packet_total_size + 7) & ~7) / CHAR_BIT; + if (props.exp_packet_total_size >= 0) { + current_packet_size_bytes = + (uint64_t) props.exp_packet_total_size / 8; + } else { + current_packet_size_bytes = ds_file->file->size; + } - if (current_packet_offset + current_packet_size_bytes > + if (current_packet_offset_bytes + current_packet_size_bytes > ds_file->file->size) { BT_LOGW("Invalid packet size reported in file: stream=\"%s\", " "packet-offset=%jd, packet-size-bytes=%jd, " "file-size=%jd", ds_file->file->path->str, - current_packet_offset, + current_packet_offset_bytes, current_packet_size_bytes, ds_file->file->size); goto error; } - next_packet_offset = current_packet_offset + - current_packet_size_bytes; - BT_LOGD("Seeking to next packet: current-packet-offset=%jd, " - "next-packet-offset=%jd", current_packet_offset, - next_packet_offset); - - entry = ctf_fs_ds_index_add_new_entry(index); - if (!entry) { + index_entry = g_new0(struct ctf_fs_ds_index_entry, 1); + if (!index_entry) { BT_LOGE_STR("Failed to allocate a new index entry."); goto error; } - ret = init_index_entry(entry, ds_file, &props, - current_packet_size_bytes, current_packet_offset); + ret = init_index_entry(index_entry, ds_file, &props, + current_packet_size_bytes, current_packet_offset_bytes); if (ret) { + g_free(index_entry); goto error; } - iter_status = bt_msg_iter_seek(ds_file->msg_iter, - next_packet_offset); + g_ptr_array_add(index->entries, index_entry); + + current_packet_offset_bytes += current_packet_size_bytes; + BT_LOGD("Seeking to next packet: current-packet-offset=%jd, " + "next-packet-offset=%jd", + current_packet_offset_bytes - current_packet_size_bytes, + current_packet_offset_bytes); + } while (iter_status == BT_MSG_ITER_STATUS_OK); - if (iter_status != BT_MSG_ITER_STATUS_EOF) { + if (iter_status != BT_MSG_ITER_STATUS_OK) { goto error; } @@ -688,6 +667,31 @@ end: return index; } +BT_HIDDEN +struct ctf_fs_ds_index *ctf_fs_ds_index_create() +{ + struct ctf_fs_ds_index *index = g_new0(struct ctf_fs_ds_index, 1); + + if (!index) { + BT_LOGE_STR("Failed to allocate index"); + goto error; + } + + index->entries = g_ptr_array_new_with_free_func((GDestroyNotify) g_free); + if (!index->entries) { + BT_LOGE("Failed to allocate index entries."); + goto error; + } + + goto end; + +error: + ctf_fs_ds_index_destroy(index); + index = NULL; +end: + return index; +} + BT_HIDDEN void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) { @@ -706,22 +710,22 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) } BT_HIDDEN -bt_message_iterator_status ctf_fs_ds_file_next( +bt_self_message_iterator_status ctf_fs_ds_file_next( struct ctf_fs_ds_file *ds_file, bt_message **msg) { enum bt_msg_iter_status msg_iter_status; - bt_message_iterator_status status; + bt_self_message_iterator_status status; msg_iter_status = bt_msg_iter_get_next_message( ds_file->msg_iter, ds_file->pc_msg_iter, msg); switch (msg_iter_status) { case BT_MSG_ITER_STATUS_EOF: - status = BT_MESSAGE_ITERATOR_STATUS_END; + status = BT_SELF_MESSAGE_ITERATOR_STATUS_END; break; case BT_MSG_ITER_STATUS_OK: - status = BT_MESSAGE_ITERATOR_STATUS_OK; + status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK; break; case BT_MSG_ITER_STATUS_AGAIN: /* @@ -733,46 +737,12 @@ bt_message_iterator_status ctf_fs_ds_file_next( case BT_MSG_ITER_STATUS_INVAL: case BT_MSG_ITER_STATUS_ERROR: default: - status = BT_MESSAGE_ITERATOR_STATUS_ERROR; + status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR; break; } return status; } -BT_HIDDEN -int ctf_fs_ds_file_borrow_packet_header_context_fields( - struct ctf_fs_ds_file *ds_file, - bt_field **packet_header_field, - bt_field **packet_context_field) -{ - enum bt_msg_iter_status msg_iter_status; - int ret = 0; - - BT_ASSERT(ds_file); - msg_iter_status = bt_msg_iter_borrow_packet_header_context_fields( - ds_file->msg_iter, packet_header_field, packet_context_field); - switch (msg_iter_status) { - case BT_MSG_ITER_STATUS_EOF: - case BT_MSG_ITER_STATUS_OK: - break; - case BT_MSG_ITER_STATUS_AGAIN: - abort(); - case BT_MSG_ITER_STATUS_INVAL: - case BT_MSG_ITER_STATUS_ERROR: - default: - goto error; - break; - } - - goto end; - -error: - ret = -1; - -end: - return ret; -} - BT_HIDDEN void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index) { @@ -781,7 +751,7 @@ void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index) } if (index->entries) { - g_array_free(index->entries, TRUE); + g_ptr_array_free(index->entries, TRUE); } g_free(index); }