X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=e89f07193b9d945ef3cf4c0ae989f97c24321a63;hb=71c5da58f2e63c0ea0df3b603d615f5aa3dde008;hp=76ea9ad502939758176908b41e15c09a54650901;hpb=2a48e5aeb946dcfcb0a6c6bbf429354cb0fd5b4e;p=babeltrace.git diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 76ea9ad5..e89f0719 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -29,18 +29,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include #include "file.h" #include "metadata.h" -#include "../common/notif-iter/notif-iter.h" -#include +#include "../common/msg-iter/msg-iter.h" +#include #include "data-stream-file.h" #include @@ -50,7 +46,7 @@ static inline size_t remaining_mmap_bytes(struct ctf_fs_ds_file *ds_file) { - return ds_file->mmap_valid_len - ds_file->request_offset; + return ds_file->mmap_len - ds_file->request_offset; } static @@ -66,7 +62,7 @@ int ds_file_munmap(struct ctf_fs_ds_file *ds_file) BT_LOGE_ERRNO("Cannot memory-unmap file", ": address=%p, size=%zu, file_path=\"%s\", file=%p", ds_file->mmap_addr, ds_file->mmap_len, - ds_file->file->path->str, + ds_file->file ? ds_file->file->path->str : "NULL", ds_file->file ? ds_file->file->fp : NULL); ret = -1; goto end; @@ -79,12 +75,11 @@ end: } static -enum bt_ctf_notif_iter_medium_status ds_file_mmap_next( +enum bt_msg_iter_medium_status ds_file_mmap_next( struct ctf_fs_ds_file *ds_file) { - const size_t page_size = bt_common_get_page_size(); - enum bt_ctf_notif_iter_medium_status ret = - BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK; + enum bt_msg_iter_medium_status ret = + BT_MSG_ITER_MEDIUM_STATUS_OK; /* Unmap old region */ if (ds_file->mmap_addr) { @@ -92,21 +87,23 @@ enum bt_ctf_notif_iter_medium_status ds_file_mmap_next( goto error; } - ds_file->mmap_offset += ds_file->mmap_valid_len; + /* + * mmap_len is guaranteed to be page-aligned except on the + * last mapping where it may not be possible (since the file's + * size itself may not be a page multiple). + */ + ds_file->mmap_offset += ds_file->mmap_len; ds_file->request_offset = 0; } - ds_file->mmap_valid_len = MIN(ds_file->file->size - ds_file->mmap_offset, + ds_file->mmap_len = MIN(ds_file->file->size - ds_file->mmap_offset, ds_file->mmap_max_len); - if (ds_file->mmap_valid_len == 0) { - ret = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF; + if (ds_file->mmap_len == 0) { + ret = BT_MSG_ITER_MEDIUM_STATUS_EOF; goto end; } - /* Round up to next page, assuming page size being a power of 2. */ - ds_file->mmap_len = (ds_file->mmap_valid_len + page_size - 1) - & ~(page_size - 1); /* Map new region */ - assert(ds_file->mmap_len); + BT_ASSERT(ds_file->mmap_len); ds_file->mmap_addr = bt_mmap((void *) 0, ds_file->mmap_len, PROT_READ, MAP_PRIVATE, fileno(ds_file->file->fp), ds_file->mmap_offset); @@ -121,18 +118,18 @@ enum bt_ctf_notif_iter_medium_status ds_file_mmap_next( goto end; error: ds_file_munmap(ds_file); - ret = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR; + ret = BT_MSG_ITER_MEDIUM_STATUS_ERROR; end: return ret; } static -enum bt_ctf_notif_iter_medium_status medop_request_bytes( +enum bt_msg_iter_medium_status medop_request_bytes( size_t request_sz, uint8_t **buffer_addr, size_t *buffer_sz, void *data) { - enum bt_ctf_notif_iter_medium_status status = - BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK; + enum bt_msg_iter_medium_status status = + BT_MSG_ITER_MEDIUM_STATUS_OK; struct ctf_fs_ds_file *ds_file = data; if (request_sz == 0) { @@ -145,15 +142,15 @@ enum bt_ctf_notif_iter_medium_status medop_request_bytes( if (ds_file->mmap_offset >= ds_file->file->size) { BT_LOGD("Reached end of file \"%s\" (%p)", ds_file->file->path->str, ds_file->file->fp); - status = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF; + status = BT_MSG_ITER_MEDIUM_STATUS_EOF; goto end; } status = ds_file_mmap_next(ds_file); switch (status) { - case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK: + case BT_MSG_ITER_MEDIUM_STATUS_OK: break; - case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF: + case BT_MSG_ITER_MEDIUM_STATUS_EOF: goto end; default: BT_LOGE("Cannot memory-map next region of file \"%s\" (%p)", @@ -169,23 +166,22 @@ enum bt_ctf_notif_iter_medium_status medop_request_bytes( goto end; error: - status = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR; + status = BT_MSG_ITER_MEDIUM_STATUS_ERROR; end: return status; } static -struct bt_ctf_stream *medop_get_stream( - struct bt_ctf_stream_class *stream_class, uint64_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; - struct bt_ctf_stream_class *ds_file_stream_class; - struct bt_ctf_stream *stream = NULL; + bt_stream_class *ds_file_stream_class; + bt_stream *stream = NULL; - ds_file_stream_class = bt_ctf_stream_get_class(ds_file->stream); - bt_put(ds_file_stream_class); + ds_file_stream_class = bt_stream_borrow_class( + ds_file->stream); if (stream_class != ds_file_stream_class) { /* @@ -201,144 +197,72 @@ end: return stream; } -BT_HIDDEN -struct bt_ctf_notif_iter_medium_ops ctf_fs_ds_file_medops = { - .request_bytes = medop_request_bytes, - .get_stream = medop_get_stream, -}; - -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; -} - -static -struct bt_ctf_clock_class *get_field_mapped_clock_class( - struct bt_ctf_field *field) -{ - struct bt_ctf_field_type *field_type; - struct bt_ctf_clock_class *clock_class = NULL; - - field_type = bt_ctf_field_get_type(field); - if (!field_type) { - goto end; - } - - clock_class = bt_ctf_field_type_integer_get_mapped_clock_class( - field_type); - if (!clock_class) { - goto end; - } -end: - bt_put(field_type); - return clock_class; -} - static -int get_ds_file_packet_bounds_clock_classes(struct ctf_fs_ds_file *ds_file, - struct bt_ctf_clock_class **_timestamp_begin_cc, - struct bt_ctf_clock_class **_timestamp_end_cc) +enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence, + off_t offset, void *data) { - int ret; - struct bt_ctf_field *timestamp_field = NULL; - struct bt_ctf_field *packet_context_field = NULL; - struct bt_ctf_clock_class *timestamp_begin_cc = NULL; - struct bt_ctf_clock_class *timestamp_end_cc = NULL; - - ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file, - NULL, &packet_context_field); - if (ret || !packet_context_field) { - BT_LOGD("Cannot retrieve packet context field of stream \'%s\'", - ds_file->file->path->str); - ret = -1; - goto end; - } - - timestamp_field = bt_ctf_field_structure_get_field_by_name( - packet_context_field, "timestamp_begin"); - if (!timestamp_field) { - BT_LOGD("Cannot retrieve timestamp_begin field in packet context of stream \'%s\'", - ds_file->file->path->str); - ret = -1; + enum bt_msg_iter_medium_status ret = + BT_MSG_ITER_MEDIUM_STATUS_OK; + struct ctf_fs_ds_file *ds_file = data; + off_t file_size = ds_file->file->size; + + if (whence != BT_MSG_ITER_SEEK_WHENCE_SET || + offset < 0 || offset > file_size) { + BT_LOGE("Invalid medium seek request: whence=%d, offset=%jd, " + "file-size=%jd", (int) whence, offset, + file_size); + ret = BT_MSG_ITER_MEDIUM_STATUS_INVAL; goto end; } - timestamp_begin_cc = get_field_mapped_clock_class(timestamp_field); - if (!timestamp_begin_cc) { - BT_LOGD("Cannot retrieve the clock mapped to timestamp_begin of stream \'%s\'", - ds_file->file->path->str); - } - BT_PUT(timestamp_field); - - timestamp_field = bt_ctf_field_structure_get_field_by_name( - packet_context_field, "timestamp_end"); - if (!timestamp_field) { - BT_LOGD("Cannot retrieve timestamp_end field in packet context of stream \'%s\'", - ds_file->file->path->str); - ret = -1; - goto end; - } + /* + * Determine whether or not the destination is contained within the + * current mapping. + */ + if (ds_file->mmap_addr && (offset < ds_file->mmap_offset || + offset >= ds_file->mmap_offset + ds_file->mmap_len)) { + int unmap_ret; + off_t offset_in_mapping = offset % bt_common_get_page_size(); + + BT_LOGD("Medium seek request cannot be accomodated by the current " + "file mapping: offset=%jd, mmap-offset=%jd, " + "mmap-len=%zu", offset, ds_file->mmap_offset, + ds_file->mmap_len); + unmap_ret = ds_file_munmap(ds_file); + if (unmap_ret) { + ret = BT_MSG_ITER_MEDIUM_STATUS_ERROR; + goto end; + } - timestamp_end_cc = get_field_mapped_clock_class(timestamp_field); - if (!timestamp_end_cc) { - BT_LOGD("Cannot retrieve the clock mapped to timestamp_end in stream \'%s\'", - ds_file->file->path->str); + 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) { + goto end; + } + } else { + ds_file->request_offset = offset - ds_file->mmap_offset; } - if (_timestamp_begin_cc) { - *_timestamp_begin_cc = bt_get(timestamp_begin_cc); - } - if (_timestamp_end_cc) { - *_timestamp_end_cc = bt_get(timestamp_end_cc); - } + ds_file->end_reached = (offset == file_size); end: - bt_put(packet_context_field); - bt_put(timestamp_field); - bt_put(timestamp_begin_cc); - bt_put(timestamp_end_cc); return ret; } +BT_HIDDEN +struct bt_msg_iter_medium_ops ctf_fs_ds_file_medops = { + .request_bytes = medop_request_bytes, + .borrow_stream = medop_borrow_stream, + .seek = medop_seek, +}; + static -int convert_cycles_to_ns(struct bt_ctf_clock_class *clock_class, +int convert_cycles_to_ns(struct ctf_clock_class *clock_class, uint64_t cycles, int64_t *ns) { - int ret = 0; - struct bt_ctf_clock_value *clock_value; - - assert(ns); - clock_value = bt_ctf_clock_value_create(clock_class, cycles); - if (!clock_value) { - ret = -1; - goto end; - } - - ret = bt_ctf_clock_value_get_value_ns_from_epoch(clock_value, ns); - if (ret) { - goto end; - } -end: - bt_put(clock_value); - return ret; + return bt_util_clock_cycles_to_ns_from_origin(cycles, + clock_class->frequency, clock_class->offset_seconds, + clock_class->offset_cycles, ns); } static @@ -360,16 +284,22 @@ struct ctf_fs_ds_index *build_index_from_idx_file( size_t file_index_entry_size; size_t file_entry_count; size_t i; - struct bt_ctf_clock_class *timestamp_begin_cc = NULL; - struct bt_ctf_clock_class *timestamp_end_cc = NULL; + struct ctf_stream_class *sc; + struct bt_msg_iter_packet_properties props; BT_LOGD("Building index from .idx file of stream file %s", ds_file->file->path->str); - - ret = get_ds_file_packet_bounds_clock_classes(ds_file, - ×tamp_begin_cc, ×tamp_end_cc); + ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props); if (ret) { - BT_LOGD("Cannot get clock classes of \"timestamp_begin\" and \"timestamp_end\" fields"); + BT_LOGD_STR("Cannot read first packet's header and context fields."); + goto error; + } + + sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, + props.stream_class_id); + BT_ASSERT(sc); + if (!sc->default_clock_class) { + BT_LOGD_STR("Cannot find stream class's default clock class."); goto error; } @@ -390,7 +320,7 @@ struct ctf_fs_ds_index *build_index_from_idx_file( index_basename = g_string_new(basename); if (!index_basename) { - BT_LOGE("Cannot allocate index file basename string"); + BT_LOGE_STR("Cannot allocate index file basename string"); goto error; } @@ -422,7 +352,7 @@ struct ctf_fs_ds_index *build_index_from_idx_file( file_pos = g_mapped_file_get_contents(mapped_file) + sizeof(*header); if (be32toh(header->magic) != CTF_INDEX_MAGIC) { - BT_LOGW("Invalid LTTng trace index: \"magic\" field validation failed"); + BT_LOGW_STR("Invalid LTTng trace index: \"magic\" field validation failed"); goto error; } @@ -436,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; @@ -453,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; @@ -476,30 +409,31 @@ struct ctf_fs_ds_index *build_index_from_idx_file( } /* Convert the packet's bound to nanoseconds since Epoch. */ - ret = convert_cycles_to_ns(timestamp_begin_cc, + ret = convert_cycles_to_ns(sc->default_clock_class, index_entry->timestamp_begin, &index_entry->timestamp_begin_ns); if (ret) { - BT_LOGD("Failed to convert raw timestamp to nanoseconds since Epoch during index parsing"); + BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch during index parsing"); goto error; } - ret = convert_cycles_to_ns(timestamp_end_cc, + ret = convert_cycles_to_ns(sc->default_clock_class, index_entry->timestamp_end, &index_entry->timestamp_end_ns); if (ret) { - BT_LOGD("Failed to convert raw timestamp to nanoseconds since Epoch during LTTng trace index parsing"); + BT_LOGD_STR("Failed to convert raw timestamp to nanoseconds since Epoch during LTTng trace index parsing"); goto error; } 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. */ if (ds_file->file->size != total_packets_size) { BT_LOGW("Invalid LTTng trace index file; indexed size != stream file size: " - "file_size=%" PRIu64 ", total_packets_size=%" PRIu64, + "file-size=%" PRIu64 ", total-packets-size=%" PRIu64, ds_file->file->size, total_packets_size); goto error; } @@ -513,9 +447,153 @@ end: if (mapped_file) { g_mapped_file_unref(mapped_file); } - bt_put(timestamp_begin_cc); - bt_put(timestamp_end_cc); return index; +error: + ctf_fs_ds_index_destroy(index); + g_free(index_entry); + index = NULL; + goto end; +} + +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, + off_t packet_size, off_t packet_offset) +{ + int ret = 0; + struct ctf_stream_class *sc; + + sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, + props->stream_class_id); + BT_ASSERT(sc); + BT_ASSERT(packet_offset >= 0); + entry->offset = packet_offset; + BT_ASSERT(packet_size >= 0); + entry->packet_size = packet_size; + + 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); + } + + 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: + return ret; +} + +static +struct ctf_fs_ds_index *build_index_from_stream_file( + struct ctf_fs_ds_file *ds_file) +{ + int ret; + struct ctf_fs_ds_index *index = NULL; + 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(); + if (!index) { + goto error; + } + + do { + off_t current_packet_size_bytes; + struct ctf_fs_ds_index_entry *index_entry; + struct bt_msg_iter_packet_properties props; + + 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; + } + + iter_status = bt_msg_iter_seek(ds_file->msg_iter, + current_packet_offset_bytes); + if (iter_status != BT_MSG_ITER_STATUS_OK) { + goto error; + } + + iter_status = bt_msg_iter_get_packet_properties( + ds_file->msg_iter, &props); + if (iter_status != BT_MSG_ITER_STATUS_OK) { + goto error; + } + + 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_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_bytes, + current_packet_size_bytes, + ds_file->file->size); + goto error; + } + + 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); + + 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(index_entry, ds_file, &props, + current_packet_size_bytes, current_packet_offset_bytes); + if (ret) { + g_free(index_entry); + goto error; + } + + g_ptr_array_add(index->entries, index_entry); + + } while (iter_status == BT_MSG_ITER_STATUS_OK); + + if (iter_status != BT_MSG_ITER_STATUS_OK) { + goto error; + } + +end: + return index; + error: ctf_fs_ds_index_destroy(index); index = NULL; @@ -525,8 +603,9 @@ error: BT_HIDDEN struct ctf_fs_ds_file *ctf_fs_ds_file_create( struct ctf_fs_trace *ctf_fs_trace, - struct bt_ctf_notif_iter *notif_iter, - struct bt_ctf_stream *stream, const char *path) + bt_self_message_iterator *pc_msg_iter, + struct bt_msg_iter *msg_iter, + bt_stream *stream, const char *path) { int ret; const size_t page_size = bt_common_get_page_size(); @@ -536,22 +615,24 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( goto error; } + ds_file->pc_msg_iter = pc_msg_iter; ds_file->file = ctf_fs_file_create(); if (!ds_file->file) { goto error; } - ds_file->stream = bt_get(stream); - ds_file->cc_prio_map = bt_get(ctf_fs_trace->cc_prio_map); + ds_file->stream = stream; + bt_stream_get_ref(ds_file->stream); + ds_file->metadata = ctf_fs_trace->metadata; g_string_assign(ds_file->file->path, path); ret = ctf_fs_file_open(ds_file->file, "rb"); if (ret) { goto error; } - ds_file->notif_iter = notif_iter; - bt_ctf_notif_iter_set_medops_data(ds_file->notif_iter, ds_file); - if (!ds_file->notif_iter) { + ds_file->msg_iter = msg_iter; + bt_msg_iter_set_medops_data(ds_file->msg_iter, ds_file); + if (!ds_file->msg_iter) { goto error; } @@ -572,7 +653,43 @@ BT_HIDDEN struct ctf_fs_ds_index *ctf_fs_ds_file_build_index( struct ctf_fs_ds_file *ds_file) { - return build_index_from_idx_file(ds_file); + struct ctf_fs_ds_index *index; + + index = build_index_from_idx_file(ds_file); + if (index) { + goto end; + } + + BT_LOGD("Failed to build index from .index file; " + "falling back to stream indexing."); + index = build_index_from_stream_file(ds_file); +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 @@ -582,8 +699,7 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) return; } - bt_put(ds_file->cc_prio_map); - bt_put(ds_file->stream); + bt_stream_put_ref(ds_file->stream); (void) ds_file_munmap(ds_file); if (ds_file->file) { @@ -594,82 +710,37 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) } BT_HIDDEN -struct bt_notification_iterator_next_return ctf_fs_ds_file_next( - struct ctf_fs_ds_file *ds_file) +bt_self_message_iterator_status ctf_fs_ds_file_next( + struct ctf_fs_ds_file *ds_file, + bt_message **msg) { - enum bt_ctf_notif_iter_status notif_iter_status; - struct bt_notification_iterator_next_return ret = { - .status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR, - .notification = NULL, - }; - - notif_iter_status = bt_ctf_notif_iter_get_next_notification( - ds_file->notif_iter, ds_file->cc_prio_map, &ret.notification); - - switch (notif_iter_status) { - case BT_CTF_NOTIF_ITER_STATUS_EOF: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_END; + enum bt_msg_iter_status msg_iter_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_SELF_MESSAGE_ITERATOR_STATUS_END; break; - case BT_CTF_NOTIF_ITER_STATUS_OK: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_OK; + case BT_MSG_ITER_STATUS_OK: + status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK; break; - case BT_CTF_NOTIF_ITER_STATUS_AGAIN: + case BT_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_CTF_NOTIF_ITER_STATUS_INVAL: - case BT_CTF_NOTIF_ITER_STATUS_ERROR: + case BT_MSG_ITER_STATUS_INVAL: + case BT_MSG_ITER_STATUS_ERROR: default: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR; break; } - - return ret; -} - -BT_HIDDEN -int ctf_fs_ds_file_get_packet_header_context_fields( - struct ctf_fs_ds_file *ds_file, - struct bt_ctf_field **packet_header_field, - struct bt_ctf_field **packet_context_field) -{ - enum bt_ctf_notif_iter_status notif_iter_status; - int ret = 0; - - assert(ds_file); - notif_iter_status = bt_ctf_notif_iter_get_packet_header_context_fields( - ds_file->notif_iter, packet_header_field, packet_context_field); - switch (notif_iter_status) { - case BT_CTF_NOTIF_ITER_STATUS_EOF: - case BT_CTF_NOTIF_ITER_STATUS_OK: - break; - case BT_CTF_NOTIF_ITER_STATUS_AGAIN: - abort(); - case BT_CTF_NOTIF_ITER_STATUS_INVAL: - case BT_CTF_NOTIF_ITER_STATUS_ERROR: - default: - goto error; - break; - } - - goto end; - -error: - ret = -1; - - if (packet_header_field) { - bt_put(*packet_header_field); - } - - if (packet_context_field) { - bt_put(*packet_context_field); - } - -end: - return ret; + return status; } BT_HIDDEN @@ -680,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); }