From bb230c9b89ed2f2fff773693b2d646bbcb235e99 Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=A9mie=20Galarneau?= Date: Sun, 27 Aug 2017 15:57:30 -0400 Subject: [PATCH] src.ctf.fs: implement stream indexing MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Jérémie Galarneau --- plugins/ctf/common/notif-iter/notif-iter.c | 76 ++++- plugins/ctf/common/notif-iter/notif-iter.h | 60 +++- plugins/ctf/fs-src/data-stream-file.c | 334 ++++++++++++++++++--- 3 files changed, 422 insertions(+), 48 deletions(-) diff --git a/plugins/ctf/common/notif-iter/notif-iter.c b/plugins/ctf/common/notif-iter/notif-iter.c index 30f9727a..6789fc54 100644 --- a/plugins/ctf/common/notif-iter/notif-iter.c +++ b/plugins/ctf/common/notif-iter/notif-iter.c @@ -232,6 +232,12 @@ struct bt_ctf_notif_iter { /* Current content size (bits) (-1 if unknown) */ int64_t cur_content_size; + /* + * Offset, in the underlying media, of the current packet's start + * (-1 if unknown). + */ + off_t cur_packet_offset; + /* bt_ctf_clock_class to uint64_t. */ GHashTable *clock_states; @@ -1803,6 +1809,7 @@ void bt_ctf_notif_iter_reset(struct bt_ctf_notif_iter *notit) notit->state = STATE_INIT; notit->cur_content_size = -1; notit->cur_packet_size = -1; + notit->cur_packet_offset = -1; } static @@ -1816,8 +1823,12 @@ int bt_ctf_notif_iter_switch_packet(struct bt_ctf_notif_iter *notit) * iterator refer to the same stream class (the first one). */ assert(notit); - BT_LOGV("Switching packet: notit-addr=%p, cur=%zu", - notit, notit->buf.at); + if (notit->cur_packet_size != -1) { + notit->cur_packet_offset += notit->cur_packet_size; + } + BT_LOGV("Switching packet: notit-addr=%p, cur=%zu, " + "packet-offset=%" PRId64, notit, notit->buf.at, + notit->cur_packet_offset); stack_clear(notit->stack); BT_PUT(notit->meta.event_class); BT_PUT(notit->packet); @@ -3137,6 +3148,7 @@ struct bt_ctf_notif_iter *bt_ctf_notif_iter_create(struct bt_ctf_trace *trace, "data=%p, notit-addr=%p", trace, bt_ctf_trace_get_name(trace), max_request_sz, data, notit); + notit->cur_packet_offset = 0; end: return notit; @@ -3271,6 +3283,7 @@ enum bt_ctf_notif_iter_status bt_ctf_notif_iter_get_packet_header_context_fields struct bt_ctf_field **packet_header_field, struct bt_ctf_field **packet_context_field) { + int ret; enum bt_ctf_notif_iter_status status = BT_CTF_NOTIF_ITER_STATUS_OK; assert(notit); @@ -3333,6 +3346,11 @@ set_fields: *packet_context_field = bt_get(notit->dscopes.stream_packet_context); } + ret = set_current_packet_content_sizes(notit); + if (ret) { + status = BT_CTF_NOTIF_ITER_STATUS_ERROR; + goto end; + } end: return status; } @@ -3344,3 +3362,57 @@ void bt_ctf_notif_iter_set_medops_data(struct bt_ctf_notif_iter *notit, assert(notit); notit->medium.data = medops_data; } + +BT_HIDDEN +enum bt_ctf_notif_iter_status bt_ctf_notif_iter_seek( + struct bt_ctf_notif_iter *notit, off_t offset) +{ + enum bt_ctf_notif_iter_status ret = BT_CTF_NOTIF_ITER_STATUS_OK; + enum bt_ctf_notif_iter_medium_status medium_status; + + assert(notit); + if (offset < 0) { + BT_LOGE("Cannot seek to negative offset: offset=%jd", offset); + ret = BT_CTF_NOTIF_ITER_STATUS_INVAL; + goto end; + } + + if (!notit->medium.medops.seek) { + ret = BT_CTF_NOTIF_ITER_STATUS_UNSUPPORTED; + BT_LOGD("Aborting seek as the iterator's underlying media does not implement seek support."); + goto end; + } + + medium_status = notit->medium.medops.seek( + BT_CTF_NOTIF_ITER_SEEK_WHENCE_SET, offset, + notit->medium.data); + if (medium_status != BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK) { + if (medium_status == BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF) { + ret = BT_CTF_NOTIF_ITER_STATUS_EOF; + } else { + ret = BT_CTF_NOTIF_ITER_STATUS_ERROR; + goto end; + } + } + + bt_ctf_notif_iter_reset(notit); + notit->cur_packet_offset = offset; +end: + return ret; +} + +BT_HIDDEN +off_t bt_ctf_notif_iter_get_current_packet_offset( + struct bt_ctf_notif_iter *notit) +{ + assert(notit); + return notit->cur_packet_offset; +} + +BT_HIDDEN +off_t bt_ctf_notif_iter_get_current_packet_size( + struct bt_ctf_notif_iter *notit) +{ + assert(notit); + return notit->cur_packet_size; +} diff --git a/plugins/ctf/common/notif-iter/notif-iter.h b/plugins/ctf/common/notif-iter/notif-iter.h index c14146e3..444b9454 100644 --- a/plugins/ctf/common/notif-iter/notif-iter.h +++ b/plugins/ctf/common/notif-iter/notif-iter.h @@ -54,21 +54,24 @@ enum bt_ctf_notif_iter_medium_status { * The medium function called by the notification iterator * function reached the end of the file. */ - BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF = 1, + BT_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF = 1, /** * There is no data available right now, try again later. */ - BT_CTF_NOTIF_ITER_MEDIUM_STATUS_AGAIN = 11, + BT_CTF_NOTIF_ITER_MEDIUM_STATUS_AGAIN = 11, + + /** Unsupported operation. */ + BT_CTF_NOTIF_ITER_MEDIUM_STATUS_UNSUPPORTED = -3, /** Invalid argument. */ - BT_CTF_NOTIF_ITER_MEDIUM_STATUS_INVAL = -2, + BT_CTF_NOTIF_ITER_MEDIUM_STATUS_INVAL = -2, /** General error. */ - BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR = -1, + BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR = -1, /** Everything okay. */ - BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK = 0, + BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK = 0, }; /** @@ -97,6 +100,9 @@ enum bt_ctf_notif_iter_status { /** Invalid argument. */ BT_CTF_NOTIF_ITER_STATUS_INVAL = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_INVAL, + /** Unsupported operation. */ + BT_CTF_NOTIF_ITER_STATUS_UNSUPPORTED = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_UNSUPPORTED, + /** General error. */ BT_CTF_NOTIF_ITER_STATUS_ERROR = BT_CTF_NOTIF_ITER_MEDIUM_STATUS_ERROR, @@ -104,6 +110,17 @@ enum bt_ctf_notif_iter_status { BT_CTF_NOTIF_ITER_STATUS_OK = 0, }; +/** + * CTF notification iterator seek operation directives. + */ +enum bt_ctf_notif_iter_seek_whence { + /** + * Set the iterator's position to an absolute offset in the underlying + * medium. + */ + BT_CTF_NOTIF_ITER_SEEK_WHENCE_SET, +}; + /** * Medium operations. * @@ -181,6 +198,22 @@ struct bt_ctf_notif_iter_medium_ops { size_t request_sz, uint8_t **buffer_addr, size_t *buffer_sz, void *data); + /** + * Repositions the underlying stream's position. + * + * This *optional* method repositions the underlying stream + * to a given absolute or relative position, as indicated by + * the whence directive. + * + * @param whence One of #bt_ctf_notif_iter_seek_whence values + * @param offset Offset to use for the given directive + * @param data User data + * @returns One of #bt_ctf_notif_iter_medium_status values + */ + enum bt_ctf_notif_iter_medium_status (* seek)( + enum bt_ctf_notif_iter_seek_whence whence, + off_t offset, void *data); + /** * Returns a stream instance (weak reference) for the given * stream class. @@ -308,6 +341,23 @@ BT_HIDDEN void bt_ctf_notif_iter_set_medops_data(struct bt_ctf_notif_iter *notit, void *medops_data); +BT_HIDDEN +enum bt_ctf_notif_iter_status bt_ctf_notif_iter_seek( + struct bt_ctf_notif_iter *notit, off_t offset); + +/* + * Get the current packet's offset in bytes relative to the media's initial + * position. + */ +BT_HIDDEN +off_t bt_ctf_notif_iter_get_current_packet_offset( + struct bt_ctf_notif_iter *notit); + +/* Get the current packet's size (in bits). */ +BT_HIDDEN +off_t bt_ctf_notif_iter_get_current_packet_size( + struct bt_ctf_notif_iter *notit); + static inline const char *bt_ctf_notif_iter_medium_status_string( enum bt_ctf_notif_iter_medium_status status) diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 052dc5e5..1a841dd6 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -66,7 +66,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; @@ -202,10 +202,64 @@ end: return stream; } +static +enum bt_ctf_notif_iter_medium_status medop_seek( + enum bt_ctf_notif_iter_seek_whence whence, off_t offset, + void *data) +{ + enum bt_ctf_notif_iter_medium_status ret = + BT_CTF_NOTIF_ITER_MEDIUM_STATUS_OK; + struct ctf_fs_ds_file *ds_file = data; + off_t file_size = ds_file->file->size; + + if (whence != BT_CTF_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_CTF_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=%zu, " + "mmap-len=%zu", offset, ds_file->mmap_offset, + ds_file->mmap_len); + unmap_ret = ds_file_munmap(ds_file); + if (unmap_ret) { + ret = BT_CTF_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_CTF_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 = { .request_bytes = medop_request_bytes, .get_stream = medop_get_stream, + .seek = medop_seek, }; static @@ -232,6 +286,16 @@ error: 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 struct bt_ctf_clock_class *get_field_mapped_clock_class( struct bt_ctf_field *field) @@ -255,67 +319,86 @@ end: } static -int get_ds_file_packet_bounds_clock_classes(struct ctf_fs_ds_file *ds_file, +int get_packet_bounds_from_packet_context( + struct bt_ctf_field *packet_context, struct bt_ctf_clock_class **_timestamp_begin_cc, - struct bt_ctf_clock_class **_timestamp_end_cc) + struct bt_ctf_field **_timestamp_begin, + struct bt_ctf_clock_class **_timestamp_end_cc, + struct bt_ctf_field **_timestamp_end) { - int ret; - struct bt_ctf_field *timestamp_field = NULL; - struct bt_ctf_field *packet_context_field = NULL; + int ret = 0; struct bt_ctf_clock_class *timestamp_begin_cc = NULL; struct bt_ctf_clock_class *timestamp_end_cc = NULL; + struct bt_ctf_field *timestamp_begin = NULL; + struct bt_ctf_field *timestamp_end = 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); + timestamp_begin = bt_ctf_field_structure_get_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_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); + timestamp_begin_cc = get_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_ctf_field_structure_get_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 = get_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); } + if (_timestamp_begin) { + *_timestamp_begin = bt_get(timestamp_begin); + } if (_timestamp_end_cc) { *_timestamp_end_cc = bt_get(timestamp_end_cc); } + if (_timestamp_end) { + *_timestamp_end = bt_get(timestamp_end); + } end: - bt_put(packet_context_field); - bt_put(timestamp_field); bt_put(timestamp_begin_cc); bt_put(timestamp_end_cc); + bt_put(timestamp_begin); + bt_put(timestamp_end); + return ret; +} + +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) +{ + struct bt_ctf_field *packet_context = NULL; + int ret = ctf_fs_ds_file_get_packet_header_context_fields(ds_file, + NULL, &packet_context); + + if (ret || !packet_context) { + BT_LOGD("Cannot retrieve packet context field of stream \'%s\'", + ds_file->file->path->str); + ret = -1; + goto end; + } + + ret = get_packet_bounds_from_packet_context(packet_context, + timestamp_begin_cc, NULL, + timestamp_end_cc, NULL); +end: + bt_put(packet_context); return ret; } @@ -370,7 +453,8 @@ struct ctf_fs_ds_index *build_index_from_idx_file( ret = get_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; } @@ -391,7 +475,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; } @@ -423,7 +507,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; } @@ -481,14 +565,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; } @@ -500,7 +584,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; } @@ -523,6 +607,163 @@ error: goto end; } +static +int init_index_entry(struct ctf_fs_ds_index_entry *entry, + struct bt_ctf_field *packet_context, off_t packet_size, + off_t packet_offset) +{ + int ret; + struct bt_ctf_field *timestamp_begin = NULL; + struct bt_ctf_field *timestamp_end = NULL; + struct bt_ctf_clock_class *timestamp_begin_cc = NULL; + struct bt_ctf_clock_class *timestamp_end_cc = NULL; + + ret = get_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; + } + + assert(packet_offset >= 0); + entry->offset = packet_offset; + + assert(packet_size >= 0); + entry->packet_size = packet_size; + + ret = bt_ctf_field_unsigned_integer_get_value(timestamp_begin, + &entry->timestamp_begin); + if (ret) { + goto end; + } + ret = bt_ctf_field_unsigned_integer_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: + bt_put(timestamp_begin); + bt_put(timestamp_begin_cc); + bt_put(timestamp_end); + bt_put(timestamp_end_cc); + 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_ctf_notif_iter_status iter_status; + struct bt_ctf_field *packet_context = NULL; + + 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; + + iter_status = bt_ctf_notif_iter_get_packet_header_context_fields( + ds_file->notif_iter, NULL, &packet_context); + if (iter_status != BT_CTF_NOTIF_ITER_STATUS_OK) { + if (iter_status == BT_CTF_NOTIF_ITER_STATUS_EOF) { + break; + } + goto error; + } + current_packet_offset = + bt_ctf_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_ctf_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_ctf_notif_iter_seek(ds_file->notif_iter, + next_packet_offset); + BT_PUT(packet_context); + } while (iter_status == BT_CTF_NOTIF_ITER_STATUS_OK); + + if (iter_status != BT_CTF_NOTIF_ITER_STATUS_EOF) { + goto error; + } +end: + bt_put(packet_context); + 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, @@ -573,7 +814,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 -- 2.34.1