X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Fdata-stream-file.c;h=3c4b0bfe67710776a9524d6d5dc6325e72020d94;hb=4cdfc5e86b64137d96c31495cbdea99801714c2b;hp=ec10a03359d3c99bb020a9d28beebf8443550b99;hpb=9d408fcae74602e3591f66623ceb85f482d948ed;p=babeltrace.git diff --git a/plugins/ctf/fs-src/data-stream-file.c b/plugins/ctf/fs-src/data-stream-file.c index ec10a033..3c4b0bfe 100644 --- a/plugins/ctf/fs-src/data-stream-file.c +++ b/plugins/ctf/fs-src/data-stream-file.c @@ -35,8 +35,8 @@ #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_ctf_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_ctf_notif_iter_medium_status ret = - BT_CTF_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,11 +99,11 @@ enum bt_ctf_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_CTF_NOTIF_ITER_MEDIUM_STATUS_EOF; + ret = BT_MSG_ITER_MEDIUM_STATUS_EOF; goto end; } /* 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); @@ -118,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_MSG_ITER_MEDIUM_STATUS_ERROR; end: return ret; } static -enum bt_ctf_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_ctf_notif_iter_medium_status status = - BT_CTF_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_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_MSG_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_MSG_ITER_MEDIUM_STATUS_OK: break; - case BT_CTF_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,23 +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_MSG_ITER_MEDIUM_STATUS_ERROR; end: return status; } static -struct bt_ctf_stream *medop_get_stream( - struct bt_ctf_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_ctf_stream_class *ds_file_stream_class; - struct bt_ctf_stream *stream = NULL; + bt_stream_class *ds_file_stream_class; + 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,21 +199,21 @@ end: } static -enum bt_ctf_notif_iter_medium_status medop_seek( - enum bt_ctf_notif_iter_seek_whence whence, off_t offset, +enum bt_msg_iter_medium_status medop_seek( + enum bt_msg_iter_seek_whence whence, off_t offset, void *data) { - enum bt_ctf_notif_iter_medium_status ret = - BT_CTF_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_CTF_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_CTF_NOTIF_ITER_MEDIUM_STATUS_INVAL; + ret = BT_MSG_ITER_MEDIUM_STATUS_INVAL; goto end; } @@ -232,14 +232,14 @@ enum bt_ctf_notif_iter_medium_status medop_seek( ds_file->mmap_len); unmap_ret = ds_file_munmap(ds_file); if (unmap_ret) { - ret = BT_CTF_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_CTF_NOTIF_ITER_MEDIUM_STATUS_OK) { + if (ret != BT_MSG_ITER_MEDIUM_STATUS_OK) { goto end; } } else { @@ -252,9 +252,9 @@ end: } BT_HIDDEN -struct bt_ctf_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, - .get_stream = medop_get_stream, + .borrow_stream = medop_borrow_stream, .seek = medop_seek, }; @@ -293,132 +293,11 @@ struct ctf_fs_ds_index_entry *ctf_fs_ds_index_add_new_entry( } static -struct bt_ctf_clock_class *get_field_mapped_clock_class( - struct bt_ctf_field *field) -{ - 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; -} - -static -int get_packet_bounds_from_packet_context( - struct bt_ctf_field *packet_context, - struct bt_ctf_clock_class **_timestamp_begin_cc, - struct bt_ctf_field **_timestamp_begin, - struct bt_ctf_clock_class **_timestamp_end_cc, - struct bt_ctf_field **_timestamp_end) -{ - 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; - - 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_begin_cc = get_field_mapped_clock_class(timestamp_begin); - if (!timestamp_begin_cc) { - BT_LOGD_STR("Cannot retrieve the clock mapped to timestamp_begin."); - } - - 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_end); - if (!timestamp_end_cc) { - 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(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; -} - -static -int convert_cycles_to_ns(struct bt_ctf_clock_class *clock_class, +int convert_cycles_to_ns(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 @@ -440,17 +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_msg_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_msg_iter_borrow_packet_header_context_fields( + ds_file->msg_iter, NULL, NULL); if (ret) { - BT_LOGD_STR("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_msg_iter_get_packet_properties(ds_file->msg_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; } @@ -557,14 +446,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) { @@ -594,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); @@ -605,62 +492,39 @@ error: 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) + 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_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; - } + struct ctf_stream_class *sc; - assert(packet_offset >= 0); + 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; - - assert(packet_size >= 0); + BT_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, + 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(timestamp_end_cc, - entry->timestamp_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: - bt_put(timestamp_begin); - bt_put(timestamp_begin_cc); - bt_put(timestamp_end); - bt_put(timestamp_end_cc); return ret; } @@ -670,8 +534,7 @@ struct ctf_fs_ds_index *build_index_from_stream_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; + enum bt_msg_iter_status iter_status; BT_LOGD("Indexing stream file %s", ds_file->file->path->str); @@ -683,34 +546,33 @@ struct ctf_fs_ds_index *build_index_from_stream_file( do { off_t current_packet_offset; off_t next_packet_offset; - off_t current_packet_size, current_packet_size_bytes; + off_t current_packet_size_bytes; struct ctf_fs_ds_index_entry *entry; + struct bt_msg_iter_packet_properties props; - 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) { + iter_status = bt_msg_iter_borrow_packet_header_context_fields( + ds_file->msg_iter, NULL, NULL); + if (iter_status != BT_MSG_ITER_STATUS_OK) { + if (iter_status == BT_MSG_ITER_STATUS_EOF) { break; } goto error; } + + ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, + &props); + BT_ASSERT(ret == 0); + current_packet_offset = - bt_ctf_notif_iter_get_current_packet_offset( - ds_file->notif_iter); + bt_msg_iter_get_current_packet_offset( + ds_file->msg_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; + ((props.exp_packet_total_size + 7) & ~7) / CHAR_BIT; if (current_packet_offset + current_packet_size_bytes > ds_file->file->size) { @@ -725,10 +587,10 @@ struct ctf_fs_ds_index *build_index_from_stream_file( } next_packet_offset = current_packet_offset + - current_packet_size_bytes; + current_packet_size_bytes; BT_LOGD("Seeking to next packet: current-packet-offset=%jd, " - "next-packet-offset=%jd", current_packet_offset, - next_packet_offset); + "next-packet-offset=%jd", current_packet_offset, + next_packet_offset); entry = ctf_fs_ds_index_add_new_entry(index); if (!entry) { @@ -736,24 +598,23 @@ struct ctf_fs_ds_index *build_index_from_stream_file( goto error; } - ret = init_index_entry(entry, packet_context, - current_packet_size_bytes, - current_packet_offset); + ret = init_index_entry(entry, ds_file, &props, + current_packet_size_bytes, current_packet_offset); if (ret) { goto error; } - iter_status = bt_ctf_notif_iter_seek(ds_file->notif_iter, + iter_status = bt_msg_iter_seek(ds_file->msg_iter, next_packet_offset); - BT_PUT(packet_context); - } while (iter_status == BT_CTF_NOTIF_ITER_STATUS_OK); + } while (iter_status == BT_MSG_ITER_STATUS_OK); - if (iter_status != BT_CTF_NOTIF_ITER_STATUS_EOF) { + if (iter_status != BT_MSG_ITER_STATUS_EOF) { goto error; } + end: - bt_put(packet_context); return index; + error: ctf_fs_ds_index_destroy(index); index = NULL; @@ -763,8 +624,9 @@ error: 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) + 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(); @@ -774,22 +636,24 @@ struct ctf_fs_ds_file *ctf_fs_ds_file_create( goto error; } + 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_ctf_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; } @@ -831,8 +695,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) { @@ -843,62 +706,59 @@ void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *ds_file) } BT_HIDDEN -struct bt_notification_iterator_next_method_return ctf_fs_ds_file_next( - struct ctf_fs_ds_file *ds_file) +bt_message_iterator_status ctf_fs_ds_file_next( + struct ctf_fs_ds_file *ds_file, + bt_message **msg) { - enum bt_ctf_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( - ds_file->notif_iter, ds_file->cc_prio_map, &ret.notification); - - switch (notif_iter_status) { - case BT_CTF_NOTIF_ITER_STATUS_EOF: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_END; + enum bt_msg_iter_status msg_iter_status; + bt_message_iterator_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_MESSAGE_ITERATOR_STATUS_END; break; - case BT_CTF_NOTIF_ITER_STATUS_OK: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_OK; + case BT_MSG_ITER_STATUS_OK: + status = BT_MESSAGE_ITERATOR_STATUS_OK; break; - case BT_CTF_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_CTF_NOTIF_ITER_STATUS_INVAL: - case BT_CTF_NOTIF_ITER_STATUS_ERROR: + case BT_MSG_ITER_STATUS_INVAL: + case BT_MSG_ITER_STATUS_ERROR: default: - ret.status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR; + status = BT_MESSAGE_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) + bt_field **packet_header_field, + bt_field **packet_context_field) { - enum bt_ctf_notif_iter_status notif_iter_status; + enum bt_msg_iter_status msg_iter_status; int ret = 0; - assert(ds_file); - notif_iter_status = bt_ctf_notif_iter_get_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: + BT_ASSERT(ds_file); + msg_iter_status = bt_msg_iter_borrow_packet_header_context_fields( + ds_file->msg_iter, packet_header_field, packet_context_field); + switch (msg_iter_status) { + case BT_MSG_ITER_STATUS_EOF: + case BT_MSG_ITER_STATUS_OK: break; - case BT_CTF_NOTIF_ITER_STATUS_AGAIN: + case BT_MSG_ITER_STATUS_AGAIN: abort(); - case BT_CTF_NOTIF_ITER_STATUS_INVAL: - case BT_CTF_NOTIF_ITER_STATUS_ERROR: + case BT_MSG_ITER_STATUS_INVAL: + case BT_MSG_ITER_STATUS_ERROR: default: goto error; break; @@ -909,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; }