X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=2b97ca3a2c556b8c1f4e611fa997ac8f1b9a2d53;hp=0ca01a61606f67c5d831c7568bc42bc2dbf58916;hb=312c056ae3d374b253fa0cfe5ed576c0b0e5e569;hpb=6de929550157bc46ee19fa5aaca3ea2e50a12c9e diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 0ca01a61..2b97ca3a 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 @@ -63,10 +59,11 @@ int ds_file_munmap(struct ctf_fs_ds_file *ds_file) } if (bt_munmap(ds_file->mmap_addr, ds_file->mmap_len)) { - BT_LOGE("Cannot memory-unmap address %p (size %zu) of file \"%s\" (%p): %s", + 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); + 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,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_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, uint64_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; - - ds_file_stream_class = bt_ctf_stream_get_class(ds_file->stream); - bt_put(ds_file_stream_class); + struct bt_stream_class *ds_file_stream_class; + struct bt_stream *stream = NULL; + ds_file_stream_class = bt_stream_borrow_class(ds_file->stream); if (stream_class != ds_file_stream_class) { /* * Not supported: two packets described by two different @@ -199,10 +196,64 @@ end: return stream; } +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_ctf_notif_iter_medium_ops ctf_fs_ds_file_medops = { +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 @@ -229,116 +280,125 @@ 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; + 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); +} - field_type = bt_ctf_field_get_type(field); +static +struct bt_clock_class *borrow_field_mapped_clock_class( + struct bt_field *field) +{ + struct bt_field_type *field_type; + struct bt_clock_class *clock_class = NULL; + + field_type = bt_field_borrow_type(field); if (!field_type) { goto end; } - clock_class = bt_ctf_field_type_integer_get_mapped_clock_class( - field_type); + clock_class = bt_field_type_integer_borrow_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) +int borrow_packet_bounds_from_packet_context( + struct bt_field *packet_context, + struct bt_clock_class **_timestamp_begin_cc, + struct bt_field **_timestamp_begin, + struct bt_clock_class **_timestamp_end_cc, + struct bt_field **_timestamp_end) { - 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); + int ret = 0; + struct bt_clock_class *timestamp_begin_cc = NULL; + struct bt_clock_class *timestamp_end_cc = NULL; + struct bt_field *timestamp_begin = NULL; + struct bt_field *timestamp_end = NULL; + + timestamp_begin = bt_field_structure_borrow_field_by_name( + packet_context, "timestamp_begin"); + if (!timestamp_begin) { + BT_LOGD_STR("Cannot retrieve timestamp_begin field in packet context."); ret = -1; goto end; } - timestamp_begin_cc = get_field_mapped_clock_class(timestamp_field); + timestamp_begin_cc = borrow_field_mapped_clock_class(timestamp_begin); if (!timestamp_begin_cc) { - BT_LOGD("Cannot retrieve the clock mapped to timestamp_begin of stream \'%s\'", - ds_file->file->path->str); + BT_LOGD_STR("Cannot retrieve the clock mapped to timestamp_begin."); } - 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); + timestamp_end = bt_field_structure_borrow_field_by_name( + packet_context, "timestamp_end"); + if (!timestamp_end) { + BT_LOGD_STR("Cannot retrieve timestamp_end field in packet context."); ret = -1; goto end; } - timestamp_end_cc = get_field_mapped_clock_class(timestamp_field); + timestamp_end_cc = borrow_field_mapped_clock_class(timestamp_end); if (!timestamp_end_cc) { - BT_LOGD("Cannot retrieve the clock mapped to timestamp_end in stream \'%s\'", - ds_file->file->path->str); + BT_LOGD_STR("Cannot retrieve the clock mapped to timestamp_end."); } if (_timestamp_begin_cc) { - *_timestamp_begin_cc = bt_get(timestamp_begin_cc); + *_timestamp_begin_cc = timestamp_begin_cc; + } + if (_timestamp_begin) { + *_timestamp_begin = timestamp_begin; } if (_timestamp_end_cc) { - *_timestamp_end_cc = bt_get(timestamp_end_cc); + *_timestamp_end_cc = timestamp_end_cc; + } + if (_timestamp_end) { + *_timestamp_end = timestamp_end; } 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, - uint64_t cycles, int64_t *ns) +int borrow_ds_file_packet_bounds_clock_classes(struct ctf_fs_ds_file *ds_file, + struct bt_clock_class **timestamp_begin_cc, + struct bt_clock_class **timestamp_end_cc) { - int ret = 0; - struct bt_ctf_clock_value *clock_value; + struct bt_field *packet_context = NULL; + int ret = ctf_fs_ds_file_borrow_packet_header_context_fields(ds_file, + NULL, &packet_context); - assert(ns); - clock_value = bt_ctf_clock_value_create(clock_class, cycles); - if (!clock_value) { + if (ret || !packet_context) { + BT_LOGD("Cannot retrieve packet context field: ds-file-path=\"%s\"", + ds_file->file->path->str); ret = -1; goto end; } - ret = bt_ctf_clock_value_get_value_ns_from_epoch(clock_value, ns); - if (ret) { - goto end; - } + ret = borrow_packet_bounds_from_packet_context(packet_context, + timestamp_begin_cc, NULL, + timestamp_end_cc, NULL); + end: - bt_put(clock_value); return ret; } +static +int convert_cycles_to_ns(struct bt_clock_class *clock_class, + uint64_t cycles, int64_t *ns) +{ + return bt_clock_class_cycles_to_ns(clock_class, cycles, ns); +} + static struct ctf_fs_ds_index *build_index_from_idx_file( struct ctf_fs_ds_file *ds_file) @@ -358,16 +418,17 @@ 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 bt_clock_class *timestamp_begin_cc = NULL; + struct bt_clock_class *timestamp_end_cc = NULL; 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, + ret = borrow_ds_file_packet_bounds_clock_classes(ds_file, ×tamp_begin_cc, ×tamp_end_cc); if (ret) { - BT_LOGD("Cannot get clock classes of \"timestamp_begin\" and \"timestamp_end\" fields"); + BT_LOGD_STR("Cannot get clock classes of \"timestamp_begin\" " + "and \"timestamp_end\" fields"); goto error; } @@ -388,7 +449,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; } @@ -420,7 +481,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; } @@ -478,14 +539,14 @@ struct ctf_fs_ds_index *build_index_from_idx_file( 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, 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; } @@ -497,7 +558,7 @@ 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 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; } @@ -511,8 +572,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); @@ -520,11 +579,166 @@ error: goto end; } +static +int init_index_entry(struct ctf_fs_ds_index_entry *entry, + struct bt_field *packet_context, off_t packet_size, + off_t packet_offset) +{ + int ret; + struct bt_field *timestamp_begin = NULL; + struct bt_field *timestamp_end = NULL; + struct bt_clock_class *timestamp_begin_cc = NULL; + struct bt_clock_class *timestamp_end_cc = NULL; + + ret = borrow_packet_bounds_from_packet_context(packet_context, + ×tamp_begin_cc, ×tamp_begin, + ×tamp_end_cc, ×tamp_end); + if (ret || !timestamp_begin_cc || !timestamp_begin || + !timestamp_end_cc || ! timestamp_end) { + BT_LOGD_STR("Failed to determine time bound fields of packet."); + goto end; + } + + BT_ASSERT(packet_offset >= 0); + entry->offset = packet_offset; + + BT_ASSERT(packet_size >= 0); + entry->packet_size = packet_size; + + ret = bt_field_integer_unsigned_get_value(timestamp_begin, + &entry->timestamp_begin); + if (ret) { + goto end; + } + ret = bt_field_integer_unsigned_get_value(timestamp_end, + &entry->timestamp_end); + if (ret) { + goto end; + } + + /* Convert the packet's bound to nanoseconds since Epoch. */ + ret = convert_cycles_to_ns(timestamp_begin_cc, + entry->timestamp_begin, + &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(timestamp_end_cc, + entry->timestamp_end, + &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, current_packet_size_bytes; + struct ctf_fs_ds_index_entry *entry; + struct bt_field *packet_context = NULL; + + iter_status = bt_notif_iter_borrow_packet_header_context_fields( + ds_file->notif_iter, NULL, &packet_context); + if (iter_status != BT_NOTIF_ITER_STATUS_OK) { + if (iter_status == BT_NOTIF_ITER_STATUS_EOF) { + break; + } + goto error; + } + + 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 = bt_notif_iter_get_current_packet_size( + ds_file->notif_iter); + if (current_packet_size < 0) { + BT_LOGE("Cannot get packet size: packet-offset=%jd", + current_packet_offset); + goto error; + } + current_packet_size_bytes = + ((current_packet_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, packet_context, + 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_notif_iter *notif_iter, - struct bt_ctf_stream *stream, const char *path) + 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(); @@ -548,7 +762,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( } ds_file->notif_iter = notif_iter; - bt_ctf_notif_iter_set_medops_data(ds_file->notif_iter, ds_file); + bt_notif_iter_set_medops_data(ds_file->notif_iter, ds_file); if (!ds_file->notif_iter) { goto error; } @@ -570,7 +784,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 @@ -592,34 +817,34 @@ 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 bt_notification_iterator_next_method_return ctf_fs_ds_file_next( struct ctf_fs_ds_file *ds_file) { - enum bt_ctf_notif_iter_status notif_iter_status; - struct bt_notification_iterator_next_return ret = { + enum bt_notif_iter_status notif_iter_status; + struct bt_notification_iterator_next_method_return ret = { .status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR, .notification = NULL, }; - notif_iter_status = bt_ctf_notif_iter_get_next_notification( + notif_iter_status = bt_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: + case BT_NOTIF_ITER_STATUS_EOF: ret.status = BT_NOTIFICATION_ITERATOR_STATUS_END; break; - case BT_CTF_NOTIF_ITER_STATUS_OK: + case BT_NOTIF_ITER_STATUS_OK: ret.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; break; @@ -629,25 +854,25 @@ struct bt_notification_iterator_next_return ctf_fs_ds_file_next( } 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; @@ -658,14 +883,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; }