X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=d046b0dfd679eb55e011f03980fd26dd1d9484be;hb=40f4ba76dd6f9508ca51b6220eaed57632281a07;hp=52954bd247d7677f0c52e52b1d46c3f180bfafef;hpb=89b08333996aedb3378fc37939d489a0768bd955;p=babeltrace.git diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 52954bd2..d046b0df 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -31,16 +31,12 @@ #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 #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 @@ -62,11 +58,12 @@ int ds_file_munmap(struct ctf_fs_ds_file *ds_file) goto end; } - if (munmap(ds_file->mmap_addr, ds_file->mmap_len)) { - BT_LOGE("Cannot memory-unmap address %p (size %zu) of file \"%s\" (%p): %s", + if (bt_munmap(ds_file->mmap_addr, ds_file->mmap_len)) { + 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->fp, - strerror(errno)); + ds_file->file ? ds_file->file->path->str : "NULL", + ds_file->file ? ds_file->file->fp : NULL); ret = -1; goto end; } @@ -78,12 +75,11 @@ end: } static -enum bt_ctf_notif_iter_medium_status ds_file_mmap_next( +enum bt_notif_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_notif_iter_medium_status ret = + BT_NOTIF_ITER_MEDIUM_STATUS_OK; /* Unmap old region */ if (ds_file->mmap_addr) { @@ -91,28 +87,30 @@ 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_NOTIF_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); - ds_file->mmap_addr = mmap((void *) 0, 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); if (ds_file->mmap_addr == MAP_FAILED) { - BT_LOGE("Cannot memory-map address (size %zu) of file \"%s\" (%p) at offset %zu: %s", + BT_LOGE("Cannot memory-map address (size %zu) of file \"%s\" (%p) at offset %jd: %s", ds_file->mmap_len, ds_file->file->path->str, - ds_file->file->fp, ds_file->mmap_offset, + ds_file->file->fp, (intmax_t) ds_file->mmap_offset, strerror(errno)); goto error; } @@ -120,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_NOTIF_ITER_MEDIUM_STATUS_ERROR; end: return ret; } static -enum bt_ctf_notif_iter_medium_status medop_request_bytes( +enum bt_notif_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_notif_iter_medium_status status = + BT_NOTIF_ITER_MEDIUM_STATUS_OK; struct ctf_fs_ds_file *ds_file = data; if (request_sz == 0) { @@ -144,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_NOTIF_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_NOTIF_ITER_MEDIUM_STATUS_OK: break; - case BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF: + case BT_NOTIF_ITER_MEDIUM_STATUS_EOF: goto end; default: BT_LOGE("Cannot memory-map next region of file \"%s\" (%p)", @@ -168,22 +166,23 @@ enum bt_ctf_notif_iter_medium_status medop_request_bytes( goto end; error: - status = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR; + status = BT_NOTIF_ITER_MEDIUM_STATUS_ERROR; end: return status; } static -struct bt_ctf_stream *medop_get_stream( - struct bt_ctf_stream_class *stream_class, void *data) +struct bt_stream *medop_borrow_stream( + struct 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; + struct bt_stream_class *ds_file_stream_class; + struct 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) { /* @@ -199,10 +198,66 @@ end: return stream; } -static struct bt_ctf_notif_iter_medium_ops medops = { +static +enum bt_notif_iter_medium_status medop_seek( + enum bt_notif_iter_seek_whence whence, off_t offset, + void *data) +{ + enum bt_notif_iter_medium_status ret = + BT_NOTIF_ITER_MEDIUM_STATUS_OK; + struct ctf_fs_ds_file *ds_file = data; + off_t file_size = ds_file->file->size; + + if (whence != BT_NOTIF_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_NOTIF_ITER_MEDIUM_STATUS_INVAL; + 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_NOTIF_ITER_MEDIUM_STATUS_ERROR; + goto end; + } + + 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_NOTIF_ITER_MEDIUM_STATUS_OK) { + goto end; + } + } else { + ds_file->request_offset = offset - ds_file->mmap_offset; + } + + ds_file->end_reached = (offset == file_size); +end: + return ret; +} + +BT_HIDDEN +struct bt_notif_iter_medium_ops ctf_fs_ds_file_medops = { .request_bytes = medop_request_bytes, - .get_stream = medop_get_stream, + .borrow_stream = medop_borrow_stream, + .seek = medop_seek, }; + static struct ctf_fs_ds_index *ctf_fs_ds_index_create(size_t length) { @@ -227,114 +282,22 @@ error: goto end; } +/* Returns a new, zeroed, index entry. */ static -struct bt_ctf_clock_class *get_field_mapped_clock_class( - struct bt_ctf_field *field) +struct ctf_fs_ds_index_entry *ctf_fs_ds_index_add_new_entry( + struct ctf_fs_ds_index *index) { - 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; + 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 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) -{ - 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; - 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; - } - - 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); - } - - if (_timestamp_begin_cc) { - *_timestamp_begin_cc = bt_get(timestamp_begin_cc); - } - if (_timestamp_end_cc) { - *_timestamp_end_cc = bt_get(timestamp_end_cc); - } -end: - bt_put(packet_context_field); - bt_put(timestamp_field); - bt_put(timestamp_begin_cc); - bt_put(timestamp_end_cc); - return ret; -} - -static -int convert_cycles_to_ns(struct bt_ctf_clock_class *clock_class, +int convert_cycles_to_ns(struct bt_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_clock_class_cycles_to_ns_from_origin(clock_class, cycles, + ns); } static @@ -356,16 +319,27 @@ 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_notif_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_notif_iter_borrow_packet_header_context_fields( + ds_file->notif_iter, NULL, NULL); if (ret) { - BT_LOGD("Cannot get clock classes of \"timestamp_begin\" and \"timestamp_end\" fields"); + BT_LOGD_STR("Cannot borrow first packet's header and context " + "fields."); + goto error; + } + + ret = bt_notif_iter_get_packet_properties(ds_file->notif_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); + if (!sc->default_clock_class) { + BT_LOGD_STR("Cannot find stream class's default clock class."); goto error; } @@ -386,7 +360,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; } @@ -399,9 +373,17 @@ struct ctf_fs_ds_index *build_index_from_idx_file( index_file_path); goto error; } + + /* + * The g_mapped_file API limits us to 4GB files on 32-bit. + * Traces with such large indexes have never been seen in the wild, + * but this would need to be adjusted to support them. + */ filesize = g_mapped_file_get_length(mapped_file); if (filesize < sizeof(*header)) { - BT_LOGW("Invalid LTTng trace index file: file size < header size"); + BT_LOGW("Invalid LTTng trace index file: " + "file size (%zu bytes) < header size (%zu bytes)", + filesize, sizeof(*header)); goto error; } @@ -410,14 +392,17 @@ 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\" validation failed"); + BT_LOGW_STR("Invalid LTTng trace index: \"magic\" field validation failed"); 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) { - BT_LOGW("Invalid index file size; not a multiple of index entry size"); + BT_LOGW("Invalid LTTng trace index: the index's size after the header " + "(%zu bytes) is not a multiple of the index entry size " + "(%zu bytes)", (filesize - sizeof(*header)), + sizeof(*header)); goto error; } @@ -434,7 +419,7 @@ struct ctf_fs_ds_index *build_index_from_idx_file( uint64_t packet_size = be64toh(file_index->packet_size); if (packet_size % CHAR_BIT) { - BT_LOGW("Invalid packet size encountered in index file"); + BT_LOGW("Invalid packet size encountered in LTTng trace index file"); goto error; } @@ -444,28 +429,35 @@ struct ctf_fs_ds_index *build_index_from_idx_file( index_entry->offset = be64toh(file_index->offset); if (i != 0 && index_entry->offset < (index_entry - 1)->offset) { - BT_LOGW("Invalid, non-monotonic, packet offset encountered in index file"); + BT_LOGW("Invalid, non-monotonic, packet offset encountered in LTTng trace index file: " + "previous offset=%" PRIu64 ", current offset=%" PRIu64, + (index_entry - 1)->offset, index_entry->offset); goto error; } index_entry->timestamp_begin = be64toh(file_index->timestamp_begin); index_entry->timestamp_end = be64toh(file_index->timestamp_end); if (index_entry->timestamp_end < index_entry->timestamp_begin) { - BT_LOGW("Invalid packet time bounds encountered in index file"); + BT_LOGW("Invalid packet time bounds encountered in LTTng trace index file (begin > end): " + "timestamp_begin=%" PRIu64 "timestamp_end=%" PRIu64, + index_entry->timestamp_begin, + index_entry->timestamp_end); goto error; } /* 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_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_STR("Failed to convert raw timestamp to nanoseconds since Epoch during LTTng trace index parsing"); goto error; } @@ -476,7 +468,9 @@ struct ctf_fs_ds_index *build_index_from_idx_file( /* Validate that the index addresses the complete stream. */ if (ds_file->file->size != total_packets_size) { - BT_LOGW("Invalid index; indexed size != stream file size"); + BT_LOGW("Invalid LTTng trace index file; indexed size != stream file size: " + "file-size=%" PRIu64 ", total-packets-size=%" PRIu64, + ds_file->file->size, total_packets_size); goto error; } end: @@ -489,8 +483,6 @@ 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); @@ -498,10 +490,143 @@ error: goto end; } +static +int init_index_entry(struct ctf_fs_ds_index_entry *entry, + struct ctf_fs_ds_file *ds_file, + struct bt_notif_iter_packet_properties *props, + off_t packet_size, off_t packet_offset) +{ + int ret; + 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; + + /* 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; + } + + 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; + } + +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_notif_iter_status iter_status; + + BT_LOGD("Indexing stream file %s", ds_file->file->path->str); + + index = ctf_fs_ds_index_create(0); + 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 bt_notif_iter_packet_properties props; + + iter_status = bt_notif_iter_borrow_packet_header_context_fields( + ds_file->notif_iter, NULL, NULL); + if (iter_status != BT_NOTIF_ITER_STATUS_OK) { + if (iter_status == BT_NOTIF_ITER_STATUS_EOF) { + break; + } + goto error; + } + + ret = bt_notif_iter_get_packet_properties(ds_file->notif_iter, + &props); + BT_ASSERT(ret == 0); + + current_packet_offset = + bt_notif_iter_get_current_packet_offset( + ds_file->notif_iter); + if (current_packet_offset < 0) { + BT_LOGE_STR("Cannot get the current packet's offset."); + goto error; + } + + current_packet_size_bytes = + ((props.exp_packet_total_size + 7) & ~7) / CHAR_BIT; + + if (current_packet_offset + 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_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) { + 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); + if (ret) { + goto error; + } + + iter_status = bt_notif_iter_seek(ds_file->notif_iter, + next_packet_offset); + } while (iter_status == BT_NOTIF_ITER_STATUS_OK); + + if (iter_status != BT_NOTIF_ITER_STATUS_EOF) { + goto error; + } + +end: + return index; + +error: + ctf_fs_ds_index_destroy(index); + index = NULL; + goto end; +} + BT_HIDDEN struct ctf_fs_ds_file *ctf_fs_ds_file_create( struct ctf_fs_trace *ctf_fs_trace, - struct bt_ctf_stream *stream, const char *path) + struct bt_self_notification_iterator *pc_notif_iter, + struct bt_notif_iter *notif_iter, + struct bt_stream *stream, const char *path) { int ret; const size_t page_size = bt_common_get_page_size(); @@ -511,21 +636,23 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( goto error; } + ds_file->pc_notif_iter = pc_notif_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_object_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 = bt_ctf_notif_iter_create( - ctf_fs_trace->metadata->trace, page_size, medops, ds_file); + ds_file->notif_iter = notif_iter; + bt_notif_iter_set_medops_data(ds_file->notif_iter, ds_file); if (!ds_file->notif_iter) { goto error; } @@ -547,7 +674,18 @@ 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 @@ -557,78 +695,70 @@ 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_object_put_ref(ds_file->stream); (void) ds_file_munmap(ds_file); if (ds_file->file) { ctf_fs_file_destroy(ds_file->file); } - if (ds_file->notif_iter) { - bt_ctf_notif_iter_destroy(ds_file->notif_iter); - } - g_free(ds_file); } BT_HIDDEN -struct bt_notification_iterator_next_return ctf_fs_ds_file_next( - struct ctf_fs_ds_file *ds_file) +enum bt_notification_iterator_status ctf_fs_ds_file_next( + struct ctf_fs_ds_file *ds_file, + struct bt_private_notification **notif) { - enum bt_ctf_notif_iter_status notif_iter_status; - struct bt_notification_iterator_next_return ret = { - .status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR, - .notification = NULL, - }; + enum bt_notif_iter_status notif_iter_status; + enum bt_notification_iterator_status status; - notif_iter_status = bt_ctf_notif_iter_get_next_notification( - ds_file->notif_iter, ds_file->cc_prio_map, &ret.notification); + notif_iter_status = bt_notif_iter_get_next_notification( + ds_file->notif_iter, ds_file->pc_notif_iter, notif); switch (notif_iter_status) { - case BT_CTF_NOTIF_ITER_STATUS_EOF: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_END; + case BT_NOTIF_ITER_STATUS_EOF: + status = BT_NOTIFICATION_ITERATOR_STATUS_END; break; - case BT_CTF_NOTIF_ITER_STATUS_OK: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_OK; + case BT_NOTIF_ITER_STATUS_OK: + status = BT_NOTIFICATION_ITERATOR_STATUS_OK; break; - case BT_CTF_NOTIF_ITER_STATUS_AGAIN: + case BT_NOTIF_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_NOTIF_ITER_STATUS_INVAL: + case BT_NOTIF_ITER_STATUS_ERROR: default: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; break; } - - return ret; + return status; } BT_HIDDEN -int ctf_fs_ds_file_get_packet_header_context_fields( +int ctf_fs_ds_file_borrow_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) + struct bt_field **packet_header_field, + struct bt_field **packet_context_field) { - enum bt_ctf_notif_iter_status notif_iter_status; + enum bt_notif_iter_status notif_iter_status; int ret = 0; - assert(ds_file); - notif_iter_status = bt_ctf_notif_iter_get_packet_header_context_fields( + BT_ASSERT(ds_file); + notif_iter_status = bt_notif_iter_borrow_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: + case BT_NOTIF_ITER_STATUS_EOF: + case BT_NOTIF_ITER_STATUS_OK: break; - case BT_CTF_NOTIF_ITER_STATUS_AGAIN: + case BT_NOTIF_ITER_STATUS_AGAIN: abort(); - case BT_CTF_NOTIF_ITER_STATUS_INVAL: - case BT_CTF_NOTIF_ITER_STATUS_ERROR: + case BT_NOTIF_ITER_STATUS_INVAL: + case BT_NOTIF_ITER_STATUS_ERROR: default: goto error; break; @@ -639,14 +769,6 @@ int ctf_fs_ds_file_get_packet_header_context_fields( error: ret = -1; - if (packet_header_field) { - bt_put(*packet_header_field); - } - - if (packet_context_field) { - bt_put(*packet_context_field); - } - end: return ret; }