X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=7fe4e6a52f1d2a12e6a359a39cc9bb28a0341629;hb=127e2341231d859921e076a37a70166e85e59596;hp=213ccc9b536ace1f0fc61d33a64979cbf141cc6e;hpb=de38c26a14b60cb3b6d31cc124c187e2c1816bf5;p=babeltrace.git diff --git a/src/plugins/ctf/fs-src/data-stream-file.c b/src/plugins/ctf/fs-src/data-stream-file.c index 213ccc9b..7fe4e6a5 100644 --- a/src/plugins/ctf/fs-src/data-stream-file.c +++ b/src/plugins/ctf/fs-src/data-stream-file.c @@ -22,16 +22,15 @@ * SOFTWARE. */ -#define BT_COMP_LOG_SELF_COMP (ds_file->self_comp) -#define BT_LOG_OUTPUT_LEVEL (ds_file->log_level) +#define BT_COMP_LOG_SELF_COMP (self_comp) +#define BT_LOG_OUTPUT_LEVEL (log_level) #define BT_LOG_TAG "PLUGIN/SRC.CTF.FS/DS" -#include "plugins/comp-logging.h" +#include "logging/comp-logging.h" #include #include #include #include -#include #include #include #include "compat/mman.h" @@ -48,15 +47,33 @@ static inline size_t remaining_mmap_bytes(struct ctf_fs_ds_file *ds_file) { - return ds_file->mmap_len - ds_file->request_offset; + BT_ASSERT_DBG(ds_file->mmap_len >= ds_file->request_offset_in_mapping); + return ds_file->mmap_len - ds_file->request_offset_in_mapping; } +/* + * Return true if `offset_in_file` is in the current mapping. + */ + static -int ds_file_munmap(struct ctf_fs_ds_file *ds_file) +bool offset_ist_mapped(struct ctf_fs_ds_file *ds_file, off_t offset_in_file) { - int ret = 0; + return offset_in_file >= ds_file->mmap_offset_in_file && + offset_in_file < (ds_file->mmap_offset_in_file + ds_file->mmap_len); +} + +static +enum ctf_msg_iter_medium_status ds_file_munmap( + struct ctf_fs_ds_file *ds_file) +{ + enum ctf_msg_iter_medium_status status; + bt_self_component *self_comp = ds_file->self_comp; + bt_logging_level log_level = ds_file->log_level; + + BT_ASSERT(ds_file); - if (!ds_file || !ds_file->mmap_addr) { + if (!ds_file->mmap_addr) { + status = CTF_MSG_ITER_MEDIUM_STATUS_OK; goto end; } @@ -66,93 +83,156 @@ int ds_file_munmap(struct ctf_fs_ds_file *ds_file) ds_file->mmap_addr, ds_file->mmap_len, ds_file->file ? ds_file->file->path->str : "NULL", ds_file->file ? ds_file->file->fp : NULL); - ret = -1; + status = CTF_MSG_ITER_MEDIUM_STATUS_ERROR; goto end; } ds_file->mmap_addr = NULL; + status = CTF_MSG_ITER_MEDIUM_STATUS_OK; end: - return ret; + return status; } +/* + * mmap a region of `ds_file` such that `requested_offset_in_file` is in the + * mapping. If the currently mmap-ed region already contains + * `requested_offset_in_file`, the mapping is kept. + * + * Set `ds_file->requested_offset_in_mapping` based on `request_offset_in_file` + * + * `requested_offset_in_file` must be a valid offset in the file. + */ static -enum bt_msg_iter_medium_status ds_file_mmap_next( - struct ctf_fs_ds_file *ds_file) +enum ctf_msg_iter_medium_status ds_file_mmap( + struct ctf_fs_ds_file *ds_file, off_t requested_offset_in_file) { - enum bt_msg_iter_medium_status ret = - BT_MSG_ITER_MEDIUM_STATUS_OK; + enum ctf_msg_iter_medium_status status; + bt_self_component *self_comp = ds_file->self_comp; + bt_logging_level log_level = ds_file->log_level; - /* Unmap old region */ - if (ds_file->mmap_addr) { - if (ds_file_munmap(ds_file)) { - goto error; - } + /* Ensure the requested offset is in the file range. */ + BT_ASSERT(requested_offset_in_file >= 0); + BT_ASSERT(requested_offset_in_file < ds_file->file->size); - /* - * 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; + /* + * If the mapping already contains the requested offset, just adjust + * requested_offset_in_mapping. + */ + if (offset_ist_mapped(ds_file, requested_offset_in_file)) { + ds_file->request_offset_in_mapping = + requested_offset_in_file - ds_file->mmap_offset_in_file; + status = CTF_MSG_ITER_MEDIUM_STATUS_OK; + goto end; } - ds_file->mmap_len = MIN(ds_file->file->size - ds_file->mmap_offset, - ds_file->mmap_max_len); - if (ds_file->mmap_len == 0) { - ret = BT_MSG_ITER_MEDIUM_STATUS_EOF; + /* Unmap old region */ + status = ds_file_munmap(ds_file); + if (status != CTF_MSG_ITER_MEDIUM_STATUS_OK) { goto end; } - /* Map new region */ - BT_ASSERT(ds_file->mmap_len); + + /* + * Compute a mapping that has the required alignment properties and + * contains `requested_offset_in_file`. + */ + ds_file->request_offset_in_mapping = + requested_offset_in_file % bt_mmap_get_offset_align_size(ds_file->log_level); + ds_file->mmap_offset_in_file = + requested_offset_in_file - ds_file->request_offset_in_mapping; + ds_file->mmap_len = MIN(ds_file->file->size - ds_file->mmap_offset_in_file, + ds_file->mmap_max_len); + + BT_ASSERT(ds_file->mmap_len > 0); + 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, ds_file->log_level); + ds_file->mmap_offset_in_file, ds_file->log_level); if (ds_file->mmap_addr == MAP_FAILED) { BT_COMP_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, (intmax_t) ds_file->mmap_offset, + ds_file->file->fp, (intmax_t) ds_file->mmap_offset_in_file, strerror(errno)); - goto error; + status = CTF_MSG_ITER_MEDIUM_STATUS_ERROR; + goto end; } - goto end; -error: - ds_file_munmap(ds_file); - ret = BT_MSG_ITER_MEDIUM_STATUS_ERROR; + status = CTF_MSG_ITER_MEDIUM_STATUS_OK; + end: - return ret; + return status; } +/* + * Change the mapping of the file to read the region that follows the current + * mapping. + * + * If the file hasn't been mapped yet, then everything (mmap_offset_in_file, + * mmap_len, request_offset_in_mapping) should have the value 0, which will + * result in the beginning of the file getting mapped. + * + * return _EOF if the current mapping is the end of the file. + */ + static -enum bt_msg_iter_medium_status medop_request_bytes( +enum ctf_msg_iter_medium_status ds_file_mmap_next( + struct ctf_fs_ds_file *ds_file) +{ + enum ctf_msg_iter_medium_status status; + + /* + * If we're called, it's because more bytes are requested but we have + * given all the bytes of the current mapping. + */ + BT_ASSERT(ds_file->request_offset_in_mapping == ds_file->mmap_len); + + /* + * If the current mapping coincides with the end of the file, there is + * no next mapping. + */ + if (ds_file->mmap_offset_in_file + ds_file->mmap_len == ds_file->file->size) { + status = CTF_MSG_ITER_MEDIUM_STATUS_EOF; + goto end; + } + + status = ds_file_mmap(ds_file, + ds_file->mmap_offset_in_file + ds_file->mmap_len); + +end: + return status; +} + +static +enum ctf_msg_iter_medium_status medop_request_bytes( size_t request_sz, uint8_t **buffer_addr, size_t *buffer_sz, void *data) { - enum bt_msg_iter_medium_status status = - BT_MSG_ITER_MEDIUM_STATUS_OK; + enum ctf_msg_iter_medium_status status = + CTF_MSG_ITER_MEDIUM_STATUS_OK; struct ctf_fs_ds_file *ds_file = data; + bt_self_component *self_comp = ds_file->self_comp; + bt_logging_level log_level = ds_file->log_level; - if (request_sz == 0) { - goto end; - } + BT_ASSERT(request_sz > 0); - /* Check if we have at least one memory-mapped byte left */ + /* + * Check if we have at least one memory-mapped byte left. If we don't, + * mmap the next file. + */ if (remaining_mmap_bytes(ds_file) == 0) { /* Are we at the end of the file? */ - if (ds_file->mmap_offset >= ds_file->file->size) { + if (ds_file->mmap_offset_in_file >= ds_file->file->size) { BT_COMP_LOGD("Reached end of file \"%s\" (%p)", ds_file->file->path->str, ds_file->file->fp); - status = BT_MSG_ITER_MEDIUM_STATUS_EOF; + status = CTF_MSG_ITER_MEDIUM_STATUS_EOF; goto end; } status = ds_file_mmap_next(ds_file); switch (status) { - case BT_MSG_ITER_MEDIUM_STATUS_OK: + case CTF_MSG_ITER_MEDIUM_STATUS_OK: break; - case BT_MSG_ITER_MEDIUM_STATUS_EOF: + case CTF_MSG_ITER_MEDIUM_STATUS_EOF: goto end; default: BT_COMP_LOGE("Cannot memory-map next region of file \"%s\" (%p)", @@ -162,13 +242,17 @@ enum bt_msg_iter_medium_status medop_request_bytes( } } + BT_ASSERT(remaining_mmap_bytes(ds_file) > 0); *buffer_sz = MIN(remaining_mmap_bytes(ds_file), request_sz); - *buffer_addr = ((uint8_t *) ds_file->mmap_addr) + ds_file->request_offset; - ds_file->request_offset += *buffer_sz; + + BT_ASSERT(ds_file->mmap_addr); + *buffer_addr = ((uint8_t *) ds_file->mmap_addr) + ds_file->request_offset_in_mapping; + + ds_file->request_offset_in_mapping += *buffer_sz; goto end; error: - status = BT_MSG_ITER_MEDIUM_STATUS_ERROR; + status = CTF_MSG_ITER_MEDIUM_STATUS_ERROR; end: return status; @@ -200,65 +284,41 @@ end: } static -enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence, - off_t offset, void *data) +enum ctf_msg_iter_medium_status medop_seek(off_t offset, void *data) { - 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_COMP_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; - } - - /* - * 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(ds_file->log_level); - - BT_COMP_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; - } - 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; - } + BT_ASSERT(offset >= 0); + BT_ASSERT(offset < ds_file->file->size); - ds_file->end_reached = (offset == file_size); -end: - return ret; + return ds_file_mmap(ds_file, offset); } BT_HIDDEN -struct bt_msg_iter_medium_ops ctf_fs_ds_file_medops = { +struct ctf_msg_iter_medium_ops ctf_fs_ds_file_medops = { .request_bytes = medop_request_bytes, .borrow_stream = medop_borrow_stream, .seek = medop_seek, }; +static +struct ctf_fs_ds_index_entry *ctf_fs_ds_index_entry_create( + bt_self_component *self_comp, bt_logging_level log_level) +{ + struct ctf_fs_ds_index_entry *entry; + + entry = g_new0(struct ctf_fs_ds_index_entry, 1); + if (!entry) { + BT_COMP_LOGE_APPEND_CAUSE(self_comp, "Failed to allocate a ctf_fs_ds_index_entry."); + goto end; + } + + entry->packet_seq_num = UINT64_MAX; + +end: + return entry; +} + static int convert_cycles_to_ns(struct ctf_clock_class *clock_class, uint64_t cycles, int64_t *ns) @@ -270,7 +330,9 @@ int convert_cycles_to_ns(struct ctf_clock_class *clock_class, static struct ctf_fs_ds_index *build_index_from_idx_file( - struct ctf_fs_ds_file *ds_file) + struct ctf_fs_ds_file *ds_file, + struct ctf_fs_ds_file_info *file_info, + struct ctf_msg_iter *msg_iter) { int ret; gchar *directory = NULL; @@ -288,11 +350,14 @@ struct ctf_fs_ds_index *build_index_from_idx_file( size_t file_entry_count; size_t i; struct ctf_stream_class *sc; - struct bt_msg_iter_packet_properties props; + struct ctf_msg_iter_packet_properties props; + uint32_t version_major, version_minor; + bt_self_component *self_comp = ds_file->self_comp; + bt_logging_level log_level = ds_file->log_level; BT_COMP_LOGI("Building index from .idx file of stream file %s", ds_file->file->path->str); - ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props); + ret = ctf_msg_iter_get_packet_properties(msg_iter, &props); if (ret) { BT_COMP_LOGI_STR("Cannot read first packet's header and context fields."); goto error; @@ -359,6 +424,16 @@ struct ctf_fs_ds_index *build_index_from_idx_file( goto error; } + version_major = be32toh(header->index_major); + version_minor = be32toh(header->index_minor); + if (version_major != 1) { + BT_COMP_LOGW( + "Unknown LTTng trace index version: " + "major=%" PRIu32 ", minor=%" PRIu32, + version_major, version_minor); + 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) { @@ -384,11 +459,17 @@ struct ctf_fs_ds_index *build_index_from_idx_file( goto error; } - index_entry = g_new0(struct ctf_fs_ds_index_entry, 1); + index_entry = ctf_fs_ds_index_entry_create( + ds_file->self_comp, ds_file->log_level); if (!index_entry) { + BT_COMP_LOGE_APPEND_CAUSE(ds_file->self_comp, + "Failed to create a ctf_fs_ds_index_entry."); goto error; } + /* Set path to stream file. */ + index_entry->path = file_info->path->str; + /* Convert size in bits to bytes. */ packet_size /= CHAR_BIT; index_entry->packet_size = packet_size; @@ -397,7 +478,7 @@ struct ctf_fs_ds_index *build_index_from_idx_file( if (i != 0 && index_entry->offset < prev_index_entry->offset) { BT_COMP_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); + prev_index_entry->offset, index_entry->offset); goto error; } @@ -427,11 +508,18 @@ struct ctf_fs_ds_index *build_index_from_idx_file( goto error; } + if (version_minor >= 1) { + index_entry->packet_seq_num = be64toh(file_index->packet_seq_num); + } + total_packets_size += packet_size; file_pos += file_index_entry_size; - g_ptr_array_add(index->entries, index_entry); prev_index_entry = index_entry; + + /* Give ownership of `index_entry` to `index->entries`. */ + g_ptr_array_add(index->entries, index_entry); + index_entry = NULL; } /* Validate that the index addresses the complete stream. */ @@ -462,11 +550,13 @@ error: 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, + struct ctf_msg_iter_packet_properties *props, off_t packet_size, off_t packet_offset) { int ret = 0; struct ctf_stream_class *sc; + bt_self_component *self_comp = ds_file->self_comp; + bt_logging_level log_level = ds_file->log_level; sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc, props->stream_class_id); @@ -477,6 +567,8 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry, entry->packet_size = packet_size; if (props->snapshots.beginning_clock != UINT64_C(-1)) { + entry->timestamp_begin = props->snapshots.beginning_clock; + /* Convert the packet's bound to nanoseconds since Epoch. */ ret = convert_cycles_to_ns(sc->default_clock_class, props->snapshots.beginning_clock, @@ -486,10 +578,14 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry, goto end; } } else { + entry->timestamp_begin = UINT64_C(-1); entry->timestamp_begin_ns = UINT64_C(-1); } if (props->snapshots.end_clock != UINT64_C(-1)) { + entry->timestamp_end = props->snapshots.end_clock; + + /* Convert the packet's bound to nanoseconds since Epoch. */ ret = convert_cycles_to_ns(sc->default_clock_class, props->snapshots.end_clock, &entry->timestamp_end_ns); @@ -498,6 +594,7 @@ int init_index_entry(struct ctf_fs_ds_index_entry *entry, goto end; } } else { + entry->timestamp_end = UINT64_C(-1); entry->timestamp_end_ns = UINT64_C(-1); } @@ -507,12 +604,16 @@ end: static struct ctf_fs_ds_index *build_index_from_stream_file( - struct ctf_fs_ds_file *ds_file) + struct ctf_fs_ds_file *ds_file, + struct ctf_fs_ds_file_info *file_info, + struct ctf_msg_iter *msg_iter) { int ret; struct ctf_fs_ds_index *index = NULL; - enum bt_msg_iter_status iter_status = BT_MSG_ITER_STATUS_OK; + enum ctf_msg_iter_status iter_status = CTF_MSG_ITER_STATUS_OK; off_t current_packet_offset_bytes = 0; + bt_self_component *self_comp = ds_file->self_comp; + bt_logging_level log_level = ds_file->log_level; BT_COMP_LOGI("Indexing stream file %s", ds_file->file->path->str); @@ -521,10 +622,10 @@ struct ctf_fs_ds_index *build_index_from_stream_file( goto error; } - do { + while (true) { off_t current_packet_size_bytes; struct ctf_fs_ds_index_entry *index_entry; - struct bt_msg_iter_packet_properties props; + struct ctf_msg_iter_packet_properties props; if (current_packet_offset_bytes < 0) { BT_COMP_LOGE_STR("Cannot get the current packet's offset."); @@ -537,15 +638,15 @@ struct ctf_fs_ds_index *build_index_from_stream_file( break; } - iter_status = bt_msg_iter_seek(ds_file->msg_iter, + iter_status = ctf_msg_iter_seek(msg_iter, current_packet_offset_bytes); - if (iter_status != BT_MSG_ITER_STATUS_OK) { + if (iter_status != CTF_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) { + iter_status = ctf_msg_iter_get_packet_properties( + msg_iter, &props); + if (iter_status != CTF_MSG_ITER_STATUS_OK) { goto error; } @@ -562,18 +663,23 @@ struct ctf_fs_ds_index *build_index_from_stream_file( "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); + (intmax_t) current_packet_offset_bytes, + (intmax_t) current_packet_size_bytes, + (intmax_t) ds_file->file->size); goto error; } - index_entry = g_new0(struct ctf_fs_ds_index_entry, 1); + index_entry = ctf_fs_ds_index_entry_create( + ds_file->self_comp, ds_file->log_level); if (!index_entry) { - BT_COMP_LOGE_STR("Failed to allocate a new index entry."); + BT_COMP_LOGE_APPEND_CAUSE(ds_file->self_comp, + "Failed to create a ctf_fs_ds_index_entry."); goto error; } + /* Set path to stream file. */ + index_entry->path = file_info->path->str; + ret = init_index_entry(index_entry, ds_file, &props, current_packet_size_bytes, current_packet_offset_bytes); if (ret) { @@ -586,13 +692,8 @@ struct ctf_fs_ds_index *build_index_from_stream_file( current_packet_offset_bytes += current_packet_size_bytes; BT_COMP_LOGD("Seeking to next packet: current-packet-offset=%jd, " "next-packet-offset=%jd", - current_packet_offset_bytes - current_packet_size_bytes, - current_packet_offset_bytes); - - } while (iter_status == BT_MSG_ITER_STATUS_OK); - - if (iter_status != BT_MSG_ITER_STATUS_OK) { - goto error; + (intmax_t) (current_packet_offset_bytes - current_packet_size_bytes), + (intmax_t) current_packet_offset_bytes); } end: @@ -607,13 +708,12 @@ error: BT_HIDDEN struct ctf_fs_ds_file *ctf_fs_ds_file_create( struct ctf_fs_trace *ctf_fs_trace, - bt_self_message_iterator *pc_msg_iter, - struct bt_msg_iter *msg_iter, + bt_self_message_iterator *self_msg_iter, bt_stream *stream, const char *path, bt_logging_level log_level) { int ret; - const size_t page_size = bt_common_get_page_size(log_level); + const size_t offset_align = bt_mmap_get_offset_align_size(log_level); struct ctf_fs_ds_file *ds_file = g_new0(struct ctf_fs_ds_file, 1); if (!ds_file) { @@ -622,7 +722,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( ds_file->log_level = log_level; ds_file->self_comp = ctf_fs_trace->self_comp; - ds_file->pc_msg_iter = pc_msg_iter; + ds_file->self_msg_iter = self_msg_iter; ds_file->file = ctf_fs_file_create(log_level, ds_file->self_comp); if (!ds_file->file) { goto error; @@ -637,13 +737,7 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( goto error; } - 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; - } - - ds_file->mmap_max_len = page_size * 2048; + ds_file->mmap_max_len = offset_align * 2048; goto end; @@ -658,18 +752,22 @@ end: BT_HIDDEN struct ctf_fs_ds_index *ctf_fs_ds_file_build_index( - struct ctf_fs_ds_file *ds_file) + struct ctf_fs_ds_file *ds_file, + struct ctf_fs_ds_file_info *file_info, + struct ctf_msg_iter *msg_iter) { struct ctf_fs_ds_index *index; + bt_self_component *self_comp = ds_file->self_comp; + bt_logging_level log_level = ds_file->log_level; - index = build_index_from_idx_file(ds_file); + index = build_index_from_idx_file(ds_file, file_info, msg_iter); if (index) { goto end; } BT_COMP_LOGI("Failed to build index from .index file; " "falling back to stream indexing."); - index = build_index_from_stream_file(ds_file); + index = build_index_from_stream_file(ds_file, file_info, msg_iter); end: return index; } @@ -719,40 +817,6 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) g_free(ds_file); } -BT_HIDDEN -bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next( - struct ctf_fs_ds_file *ds_file, - bt_message **msg) -{ - enum bt_msg_iter_status msg_iter_status; - bt_component_class_message_iterator_next_method_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_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_END; - break; - case BT_MSG_ITER_STATUS_OK: - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK; - break; - 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_MSG_ITER_STATUS_INVAL: - case BT_MSG_ITER_STATUS_ERROR: - default: - status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR; - break; - } - return status; -} - BT_HIDDEN void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index) {