X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=99d3b472b58838fa884750bd0f4cbe66cd207d37;hb=68b66a256a54d32992dfefeaad11eea88b7df234;hp=2af4d177173b63a8ea6683bb1e0ad7a6bb1d91b9;hpb=f0010051db62783ef057e8a6b625d6b4444671c2;p=babeltrace.git diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index 2af4d177..99d3b472 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -29,14 +29,14 @@ #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 @@ -75,11 +75,11 @@ end: } static -enum bt_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) { - enum bt_notif_iter_medium_status ret = - BT_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) { @@ -99,7 +99,7 @@ enum bt_notif_iter_medium_status ds_file_mmap_next( 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_NOTIF_ITER_MEDIUM_STATUS_EOF; + ret = BT_MSG_ITER_MEDIUM_STATUS_EOF; goto end; } /* Map new region */ @@ -118,18 +118,18 @@ enum bt_notif_iter_medium_status ds_file_mmap_next( goto end; error: ds_file_munmap(ds_file); - ret = BT_NOTIF_ITER_MEDIUM_STATUS_ERROR; + ret = BT_MSG_ITER_MEDIUM_STATUS_ERROR; end: return ret; } static -enum bt_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_notif_iter_medium_status status = - BT_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) { @@ -142,15 +142,15 @@ enum bt_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_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_NOTIF_ITER_MEDIUM_STATUS_OK: + case BT_MSG_ITER_MEDIUM_STATUS_OK: break; - case BT_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)", @@ -166,22 +166,23 @@ enum bt_notif_iter_medium_status medop_request_bytes( goto end; error: - status = BT_NOTIF_ITER_MEDIUM_STATUS_ERROR; + status = BT_MSG_ITER_MEDIUM_STATUS_ERROR; end: return status; } static -struct bt_stream *medop_borrow_stream( - struct bt_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_stream_class *ds_file_stream_class; - struct bt_stream *stream = NULL; + bt_stream_class *ds_file_stream_class; + bt_stream *stream = NULL; + + ds_file_stream_class = bt_stream_borrow_class( + ds_file->stream); - 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 @@ -197,21 +198,20 @@ end: } static -enum bt_notif_iter_medium_status medop_seek( - enum bt_notif_iter_seek_whence whence, off_t offset, - void *data) +enum bt_msg_iter_medium_status medop_seek(enum bt_msg_iter_seek_whence whence, + off_t offset, void *data) { - enum bt_notif_iter_medium_status ret = - BT_NOTIF_ITER_MEDIUM_STATUS_OK; + 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_NOTIF_ITER_SEEK_WHENCE_SET || + 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_NOTIF_ITER_MEDIUM_STATUS_INVAL; + ret = BT_MSG_ITER_MEDIUM_STATUS_INVAL; goto end; } @@ -230,14 +230,14 @@ enum bt_notif_iter_medium_status medop_seek( ds_file->mmap_len); unmap_ret = ds_file_munmap(ds_file); if (unmap_ret) { - ret = BT_NOTIF_ITER_MEDIUM_STATUS_ERROR; + 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_NOTIF_ITER_MEDIUM_STATUS_OK) { + if (ret != BT_MSG_ITER_MEDIUM_STATUS_OK) { goto end; } } else { @@ -250,153 +250,19 @@ end: } BT_HIDDEN -struct bt_notif_iter_medium_ops ctf_fs_ds_file_medops = { +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 -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; -} - -/* 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_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_field_type_integer_borrow_mapped_clock_class( - field_type); - if (!clock_class) { - goto end; - } - -end: - return clock_class; -} - -static -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 = 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 = borrow_field_mapped_clock_class(timestamp_begin); - if (!timestamp_begin_cc) { - BT_LOGD_STR("Cannot retrieve the clock mapped to timestamp_begin."); - } - - 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 = borrow_field_mapped_clock_class(timestamp_end); - if (!timestamp_end_cc) { - BT_LOGD_STR("Cannot retrieve the clock mapped to timestamp_end."); - } - - if (_timestamp_begin_cc) { - *_timestamp_begin_cc = timestamp_begin_cc; - } - if (_timestamp_begin) { - *_timestamp_begin = timestamp_begin; - } - if (_timestamp_end_cc) { - *_timestamp_end_cc = timestamp_end_cc; - } - if (_timestamp_end) { - *_timestamp_end = timestamp_end; - } -end: - return ret; -} - -static -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) -{ - struct bt_field *packet_context = NULL; - int ret = ctf_fs_ds_file_borrow_packet_header_context_fields(ds_file, - NULL, &packet_context); - - 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 = borrow_packet_bounds_from_packet_context(packet_context, - timestamp_begin_cc, NULL, - timestamp_end_cc, NULL); - -end: - return ret; -} - -static -int convert_cycles_to_ns(struct bt_clock_class *clock_class, +int convert_cycles_to_ns(struct ctf_clock_class *clock_class, uint64_t cycles, int64_t *ns) { - return bt_clock_class_cycles_to_ns(clock_class, cycles, ns); + return bt_util_clock_cycles_to_ns_from_origin(cycles, + clock_class->frequency, clock_class->offset_seconds, + clock_class->offset_cycles, ns); } static @@ -418,17 +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_clock_class *timestamp_begin_cc = NULL; - struct bt_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 = borrow_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_STR("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; } @@ -495,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; @@ -512,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; @@ -535,14 +409,14 @@ 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_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) { @@ -552,7 +426,8 @@ struct ctf_fs_ds_index *build_index_from_idx_file( 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. */ @@ -575,62 +450,51 @@ end: 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 bt_field *packet_context, off_t packet_size, - off_t packet_offset) + struct ctf_fs_ds_file *ds_file, + struct bt_msg_iter_packet_properties *props, + 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; - } + 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; - 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; + 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); } - 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; + 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: @@ -643,85 +507,87 @@ struct ctf_fs_ds_index *build_index_from_stream_file( { int ret; struct ctf_fs_ds_index *index = NULL; - enum bt_notif_iter_status iter_status; + 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(0); + index = ctf_fs_ds_index_create(); 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; - } + 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; } - 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."); + iter_status = bt_msg_iter_seek(ds_file->msg_iter, + current_packet_offset_bytes); + if (iter_status != BT_MSG_ITER_STATUS_OK) { 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); + iter_status = bt_msg_iter_get_packet_properties( + ds_file->msg_iter, &props); + if (iter_status != BT_MSG_ITER_STATUS_OK) { goto error; } - current_packet_size_bytes = - ((current_packet_size + 7) & ~7) / CHAR_BIT; - if (current_packet_offset + current_packet_size_bytes > + 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, + current_packet_offset_bytes, 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) { + 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(entry, packet_context, - current_packet_size_bytes, - current_packet_offset); + 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; } - iter_status = bt_notif_iter_seek(ds_file->notif_iter, - next_packet_offset); - } while (iter_status == BT_NOTIF_ITER_STATUS_OK); + g_ptr_array_add(index->entries, index_entry); + + 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); + + } while (iter_status == BT_MSG_ITER_STATUS_OK); - if (iter_status != BT_NOTIF_ITER_STATUS_EOF) { + if (iter_status != BT_MSG_ITER_STATUS_OK) { goto error; } @@ -737,9 +603,9 @@ error: BT_HIDDEN struct ctf_fs_ds_file *ctf_fs_ds_file_create( struct ctf_fs_trace *ctf_fs_trace, - struct bt_private_connection_private_notification_iterator *pc_notif_iter, - struct bt_notif_iter *notif_iter, - struct bt_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(); @@ -749,23 +615,24 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( goto error; } - ds_file->pc_notif_iter = pc_notif_iter; + 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_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; } @@ -800,6 +667,31 @@ 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 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) { @@ -807,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) { @@ -819,74 +710,39 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) } BT_HIDDEN -enum bt_notification_iterator_status ctf_fs_ds_file_next( +bt_self_message_iterator_status ctf_fs_ds_file_next( struct ctf_fs_ds_file *ds_file, - struct bt_notification **notif) + bt_message **msg) { - enum bt_notif_iter_status notif_iter_status; - enum bt_notification_iterator_status status; + enum bt_msg_iter_status msg_iter_status; + bt_self_message_iterator_status status; - notif_iter_status = bt_notif_iter_get_next_notification( - ds_file->notif_iter, ds_file->pc_notif_iter, notif); + msg_iter_status = bt_msg_iter_get_next_message( + ds_file->msg_iter, ds_file->pc_msg_iter, msg); - switch (notif_iter_status) { - case BT_NOTIF_ITER_STATUS_EOF: - status = BT_NOTIFICATION_ITERATOR_STATUS_END; + switch (msg_iter_status) { + case BT_MSG_ITER_STATUS_EOF: + status = BT_SELF_MESSAGE_ITERATOR_STATUS_END; break; - case BT_NOTIF_ITER_STATUS_OK: - status = BT_NOTIFICATION_ITERATOR_STATUS_OK; + case BT_MSG_ITER_STATUS_OK: + status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK; break; - case BT_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_NOTIF_ITER_STATUS_INVAL: - case BT_NOTIF_ITER_STATUS_ERROR: + case BT_MSG_ITER_STATUS_INVAL: + case BT_MSG_ITER_STATUS_ERROR: default: - status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR; break; } - return status; } -BT_HIDDEN -int ctf_fs_ds_file_borrow_packet_header_context_fields( - struct ctf_fs_ds_file *ds_file, - struct bt_field **packet_header_field, - struct bt_field **packet_context_field) -{ - enum bt_notif_iter_status notif_iter_status; - int ret = 0; - - 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_NOTIF_ITER_STATUS_EOF: - case BT_NOTIF_ITER_STATUS_OK: - break; - case BT_NOTIF_ITER_STATUS_AGAIN: - abort(); - case BT_NOTIF_ITER_STATUS_INVAL: - case BT_NOTIF_ITER_STATUS_ERROR: - default: - goto error; - break; - } - - goto end; - -error: - ret = -1; - -end: - return ret; -} - BT_HIDDEN void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index) { @@ -895,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); }