X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fiterator.c;h=0beb69497d5e14b18e0b769f458dc740dd2a7022;hb=43c59509042845f8d42c3e99ec74d45fa2dc0908;hp=d70514bdb2ad3ab3e2fd3b398cd2bdc750cf65e0;hpb=7c7301d5827bd10ec7c34da7ffc5fe74e5047d38;p=babeltrace.git diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c index d70514bd..0beb6949 100644 --- a/src/lib/graph/iterator.c +++ b/src/lib/graph/iterator.c @@ -29,37 +29,28 @@ #include "lib/trace-ir/clock-class.h" #include "lib/trace-ir/clock-snapshot.h" #include -#include +#include #include "lib/trace-ir/event.h" -#include +#include #include "lib/trace-ir/packet.h" #include "lib/trace-ir/stream.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #include -#include +#include #include #include "common/assert.h" #include "lib/assert-pre.h" #include "lib/assert-post.h" #include #include +#include #include #include "component-class.h" @@ -68,6 +59,7 @@ #include "component-source.h" #include "connection.h" #include "graph.h" +#include "message-iterator-class.h" #include "message/discarded-items.h" #include "message/event.h" #include "message/iterator.h" @@ -84,27 +76,26 @@ #define MSG_BATCH_SIZE 15 #define BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(_iter) \ - BT_ASSERT_PRE((_iter)->state == BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE || \ - (_iter)->state == BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED || \ - (_iter)->state == BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN || \ - (_iter)->state == BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR, \ + BT_ASSERT_PRE((_iter)->state == BT_MESSAGE_ITERATOR_STATE_ACTIVE || \ + (_iter)->state == BT_MESSAGE_ITERATOR_STATE_ENDED || \ + (_iter)->state == BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN || \ + (_iter)->state == BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR, \ "Message iterator is in the wrong state: %!+i", _iter) static inline -void set_self_comp_port_input_msg_iterator_state( - struct bt_self_component_port_input_message_iterator *iterator, - enum bt_self_component_port_input_message_iterator_state state) +void set_msg_iterator_state(struct bt_message_iterator *iterator, + enum bt_message_iterator_state state) { BT_ASSERT_DBG(iterator); BT_LIB_LOGD("Updating message iterator's state: new-state=%s", - bt_self_component_port_input_message_iterator_state_string(state)); + bt_message_iterator_state_string(state)); iterator->state = state; } static -void bt_self_component_port_input_message_iterator_destroy(struct bt_object *obj) +void bt_message_iterator_destroy(struct bt_object *obj) { - struct bt_self_component_port_input_message_iterator *iterator; + struct bt_message_iterator *iterator; BT_ASSERT(obj); @@ -123,7 +114,7 @@ void bt_self_component_port_input_message_iterator_destroy(struct bt_object *obj iterator = (void *) obj; BT_LIB_LOGI("Destroying self component input port message iterator object: " "%!+i", iterator); - bt_self_component_port_input_message_iterator_try_finalize(iterator); + bt_message_iterator_try_finalize(iterator); if (iterator->connection) { /* @@ -164,75 +155,78 @@ void bt_self_component_port_input_message_iterator_destroy(struct bt_object *obj } BT_HIDDEN -void bt_self_component_port_input_message_iterator_try_finalize( - struct bt_self_component_port_input_message_iterator *iterator) +void bt_message_iterator_try_finalize( + struct bt_message_iterator *iterator) { uint64_t i; - typedef void (*method_t)(void *); - - struct bt_component_class *comp_class = NULL; - method_t method = NULL; + bool call_user_finalize = true; BT_ASSERT(iterator); switch (iterator->state) { - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_NON_INITIALIZED: - /* Skip user finalization if user initialization failed */ - BT_LIB_LOGD("Not finalizing non-initialized message iterator: " - "%!+i", iterator); - goto end; - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZED: + case BT_MESSAGE_ITERATOR_STATE_NON_INITIALIZED: + /* + * If this function is called while the iterator is in the + * NON_INITIALIZED state, it means the user initialization + * method has either not been called, or has failed. We + * therefore don't want to call the user finalization method. + * However, the initialization method might have created some + * upstream message iterators before failing, so we want to + * execute the rest of this function, which unlinks the related + * iterators. + */ + call_user_finalize = false; + break; + case BT_MESSAGE_ITERATOR_STATE_FINALIZED: /* Already finalized */ BT_LIB_LOGD("Not finalizing message iterator: already finalized: " "%!+i", iterator); goto end; - case BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZING: + case BT_MESSAGE_ITERATOR_STATE_FINALIZING: /* Finalizing */ BT_LIB_LOGF("Message iterator is already being finalized: " "%!+i", iterator); - abort(); + bt_common_abort(); default: break; } BT_LIB_LOGD("Finalizing message iterator: %!+i", iterator); - set_self_comp_port_input_msg_iterator_state(iterator, - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZING); + set_msg_iterator_state(iterator, + BT_MESSAGE_ITERATOR_STATE_FINALIZING); BT_ASSERT(iterator->upstream_component); - comp_class = iterator->upstream_component->class; /* Call user-defined destroy method */ - switch (comp_class->type) { - case BT_COMPONENT_CLASS_TYPE_SOURCE: - { - struct bt_component_class_source *src_comp_cls = - (void *) comp_class; + if (call_user_finalize) { + typedef void (*method_t)(void *); + method_t method; + struct bt_component_class *comp_class = + iterator->upstream_component->class; + struct bt_component_class_with_iterator_class *class_with_iter_class; - method = (method_t) src_comp_cls->methods.msg_iter_finalize; - break; - } - case BT_COMPONENT_CLASS_TYPE_FILTER: - { - struct bt_component_class_filter *flt_comp_cls = - (void *) comp_class; + BT_ASSERT(bt_component_class_has_message_iterator_class(comp_class)); + class_with_iter_class = container_of(comp_class, + struct bt_component_class_with_iterator_class, parent); + method = (method_t) class_with_iter_class->msg_iter_cls->methods.finalize; - method = (method_t) flt_comp_cls->methods.msg_iter_finalize; - break; - } - default: - /* Unreachable */ - abort(); - } + if (method) { + const bt_error *saved_error; - if (method) { - BT_LIB_LOGD("Calling user's finalization method: %!+i", - iterator); - method(iterator); + saved_error = bt_current_thread_take_error(); + + BT_LIB_LOGD("Calling user's finalization method: %!+i", + iterator); + method(iterator); + + if (saved_error) { + BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error); + } + } } /* Detach upstream message iterators */ for (i = 0; i < iterator->upstream_msg_iters->len; i++) { - struct bt_self_component_port_input_message_iterator *upstream_msg_iter = + struct bt_message_iterator *upstream_msg_iter = iterator->upstream_msg_iters->pdata[i]; upstream_msg_iter->downstream_msg_iter = NULL; @@ -253,8 +247,8 @@ void bt_self_component_port_input_message_iterator_try_finalize( iterator->upstream_component = NULL; iterator->upstream_port = NULL; - set_self_comp_port_input_msg_iterator_state(iterator, - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZED); + set_msg_iterator_state(iterator, + BT_MESSAGE_ITERATOR_STATE_FINALIZED); BT_LIB_LOGD("Finalized message iterator: %!+i", iterator); end: @@ -262,8 +256,8 @@ end: } BT_HIDDEN -void bt_self_component_port_input_message_iterator_set_connection( - struct bt_self_component_port_input_message_iterator *iterator, +void bt_message_iterator_set_connection( + struct bt_message_iterator *iterator, struct bt_connection *connection) { BT_ASSERT(iterator); @@ -274,7 +268,7 @@ void bt_self_component_port_input_message_iterator_set_connection( static enum bt_message_iterator_can_seek_beginning_status can_seek_ns_from_origin_true( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, int64_t ns_from_origin, bt_bool *can_seek) { *can_seek = BT_TRUE; @@ -284,7 +278,7 @@ enum bt_message_iterator_can_seek_beginning_status can_seek_ns_from_origin_true( static enum bt_message_iterator_can_seek_beginning_status can_seek_beginning_true( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, bt_bool *can_seek) { *can_seek = BT_TRUE; @@ -296,21 +290,19 @@ static int create_self_component_input_port_message_iterator( struct bt_self_message_iterator *self_downstream_msg_iter, struct bt_self_component_port_input *self_port, - struct bt_self_component_port_input_message_iterator **message_iterator) + struct bt_message_iterator **message_iterator) { - typedef enum bt_component_class_message_iterator_initialize_method_status (*init_method_t)( - void *, void *, void *, void *); - - init_method_t init_method = NULL; - struct bt_self_component_port_input_message_iterator *iterator = + bt_message_iterator_class_initialize_method init_method = NULL; + struct bt_message_iterator *iterator = NULL; - struct bt_self_component_port_input_message_iterator *downstream_msg_iter = + struct bt_message_iterator *downstream_msg_iter = (void *) self_downstream_msg_iter; struct bt_port *port = (void *) self_port; struct bt_port *upstream_port; struct bt_component *comp; struct bt_component *upstream_comp; struct bt_component_class *upstream_comp_cls; + struct bt_component_class_with_iterator_class *upstream_comp_cls_with_iter_cls; int status; BT_ASSERT_PRE_NON_NULL(message_iterator, "Created message iterator"); @@ -340,7 +332,7 @@ int create_self_component_input_port_message_iterator( BT_LIB_LOGI("Creating message iterator on self component input port: " "%![up-comp-]+c, %![up-port-]+p", upstream_comp, upstream_port); iterator = g_new0( - struct bt_self_component_port_input_message_iterator, 1); + struct bt_message_iterator, 1); if (!iterator) { BT_LIB_LOGE_APPEND_CAUSE( "Failed to allocate one self component input port " @@ -350,7 +342,7 @@ int create_self_component_input_port_message_iterator( } bt_object_init_shared(&iterator->base, - bt_self_component_port_input_message_iterator_destroy); + bt_message_iterator_destroy); iterator->msgs = g_ptr_array_new(); if (!iterator->msgs) { BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray."); @@ -378,104 +370,58 @@ int create_self_component_input_port_message_iterator( iterator->upstream_port = upstream_port; iterator->connection = iterator->upstream_port->connection; iterator->graph = bt_component_borrow_graph(upstream_comp); - set_self_comp_port_input_msg_iterator_state(iterator, - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_NON_INITIALIZED); - - switch (iterator->upstream_component->class->type) { - case BT_COMPONENT_CLASS_TYPE_SOURCE: - { - struct bt_component_class_source *src_comp_cls = - (void *) iterator->upstream_component->class; - - iterator->methods.next = - (bt_self_component_port_input_message_iterator_next_method) - src_comp_cls->methods.msg_iter_next; - iterator->methods.seek_ns_from_origin = - (bt_self_component_port_input_message_iterator_seek_ns_from_origin_method) - src_comp_cls->methods.msg_iter_seek_ns_from_origin; - iterator->methods.seek_beginning = - (bt_self_component_port_input_message_iterator_seek_beginning_method) - src_comp_cls->methods.msg_iter_seek_beginning; - iterator->methods.can_seek_ns_from_origin = - (bt_self_component_port_input_message_iterator_can_seek_ns_from_origin_method) - src_comp_cls->methods.msg_iter_can_seek_ns_from_origin; - iterator->methods.can_seek_beginning = - (bt_self_component_port_input_message_iterator_can_seek_beginning_method) - src_comp_cls->methods.msg_iter_can_seek_beginning; - break; - } - case BT_COMPONENT_CLASS_TYPE_FILTER: - { - struct bt_component_class_filter *flt_comp_cls = - (void *) iterator->upstream_component->class; - - iterator->methods.next = - (bt_self_component_port_input_message_iterator_next_method) - flt_comp_cls->methods.msg_iter_next; - iterator->methods.seek_ns_from_origin = - (bt_self_component_port_input_message_iterator_seek_ns_from_origin_method) - flt_comp_cls->methods.msg_iter_seek_ns_from_origin; - iterator->methods.seek_beginning = - (bt_self_component_port_input_message_iterator_seek_beginning_method) - flt_comp_cls->methods.msg_iter_seek_beginning; - iterator->methods.can_seek_ns_from_origin = - (bt_self_component_port_input_message_iterator_can_seek_ns_from_origin_method) - flt_comp_cls->methods.msg_iter_can_seek_ns_from_origin; - iterator->methods.can_seek_beginning = - (bt_self_component_port_input_message_iterator_can_seek_beginning_method) - flt_comp_cls->methods.msg_iter_can_seek_beginning; - break; - } - default: - abort(); - } + set_msg_iterator_state(iterator, + BT_MESSAGE_ITERATOR_STATE_NON_INITIALIZED); + + /* Copy methods from the message iterator class to the message iterator. */ + BT_ASSERT(bt_component_class_has_message_iterator_class(upstream_comp_cls)); + upstream_comp_cls_with_iter_cls = container_of(upstream_comp_cls, + struct bt_component_class_with_iterator_class, parent); + + iterator->methods.next = + (bt_message_iterator_next_method) + upstream_comp_cls_with_iter_cls->msg_iter_cls->methods.next; + iterator->methods.seek_ns_from_origin = + (bt_message_iterator_seek_ns_from_origin_method) + upstream_comp_cls_with_iter_cls->msg_iter_cls->methods.seek_ns_from_origin; + iterator->methods.seek_beginning = + (bt_message_iterator_seek_beginning_method) + upstream_comp_cls_with_iter_cls->msg_iter_cls->methods.seek_beginning; + iterator->methods.can_seek_ns_from_origin = + (bt_message_iterator_can_seek_ns_from_origin_method) + upstream_comp_cls_with_iter_cls->msg_iter_cls->methods.can_seek_ns_from_origin; + iterator->methods.can_seek_beginning = + (bt_message_iterator_can_seek_beginning_method) + upstream_comp_cls_with_iter_cls->msg_iter_cls->methods.can_seek_beginning; if (iterator->methods.seek_ns_from_origin && !iterator->methods.can_seek_ns_from_origin) { iterator->methods.can_seek_ns_from_origin = - (bt_self_component_port_input_message_iterator_can_seek_ns_from_origin_method) + (bt_message_iterator_can_seek_ns_from_origin_method) can_seek_ns_from_origin_true; } if (iterator->methods.seek_beginning && !iterator->methods.can_seek_beginning) { iterator->methods.can_seek_beginning = - (bt_self_component_port_input_message_iterator_can_seek_beginning_method) + (bt_message_iterator_can_seek_beginning_method) can_seek_beginning_true; } - switch (upstream_comp_cls->type) { - case BT_COMPONENT_CLASS_TYPE_SOURCE: - { - struct bt_component_class_source *src_comp_cls = - (void *) upstream_comp_cls; - - init_method = - (init_method_t) src_comp_cls->methods.msg_iter_initialize; - break; - } - case BT_COMPONENT_CLASS_TYPE_FILTER: - { - struct bt_component_class_filter *flt_comp_cls = - (void *) upstream_comp_cls; - - init_method = - (init_method_t) flt_comp_cls->methods.msg_iter_initialize; - break; - } - default: - /* Unreachable */ - abort(); - } + /* Call iterator's init method. */ + init_method = upstream_comp_cls_with_iter_cls->msg_iter_cls->methods.initialize; if (init_method) { - enum bt_component_class_message_iterator_initialize_method_status iter_status; + enum bt_message_iterator_class_initialize_method_status iter_status; BT_LIB_LOGD("Calling user's initialization method: %!+i", iterator); - iter_status = init_method(iterator, &iterator->config, upstream_comp, - upstream_port); + iter_status = init_method( + (struct bt_self_message_iterator *) iterator, + &iterator->config, + (struct bt_self_component_port_output *) upstream_port); BT_LOGD("User method returned: status=%s", bt_common_func_status_string(iter_status)); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(iter_status); if (iter_status != BT_FUNC_STATUS_OK) { BT_LIB_LOGW_APPEND_CAUSE( "Component input port message iterator initialization method failed: " @@ -501,8 +447,8 @@ int create_self_component_input_port_message_iterator( iterator); } - set_self_comp_port_input_msg_iterator_state(iterator, - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE); + set_msg_iterator_state(iterator, + BT_MESSAGE_ITERATOR_STATE_ACTIVE); g_ptr_array_add(port->connection->iterators, iterator); BT_LIB_LOGI("Created message iterator on self component input port: " "%![up-port-]+p, %![up-comp-]+c, %![iter-]+i", @@ -519,23 +465,25 @@ end: return status; } -bt_self_component_port_input_message_iterator_create_from_message_iterator_status -bt_self_component_port_input_message_iterator_create_from_message_iterator( +bt_message_iterator_create_from_message_iterator_status +bt_message_iterator_create_from_message_iterator( struct bt_self_message_iterator *self_msg_iter, struct bt_self_component_port_input *input_port, - struct bt_self_component_port_input_message_iterator **message_iterator) + struct bt_message_iterator **message_iterator) { + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(self_msg_iter, "Message iterator"); return create_self_component_input_port_message_iterator(self_msg_iter, input_port, message_iterator); } -bt_self_component_port_input_message_iterator_create_from_sink_component_status -bt_self_component_port_input_message_iterator_create_from_sink_component( +bt_message_iterator_create_from_sink_component_status +bt_message_iterator_create_from_sink_component( struct bt_self_component_sink *self_comp, struct bt_self_component_port_input *input_port, - struct bt_self_component_port_input_message_iterator **message_iterator) + struct bt_message_iterator **message_iterator) { + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(self_comp, "Sink component"); return create_self_component_input_port_message_iterator(NULL, input_port, message_iterator); @@ -544,7 +492,7 @@ bt_self_component_port_input_message_iterator_create_from_sink_component( void *bt_self_message_iterator_get_data( const struct bt_self_message_iterator *self_iterator) { - struct bt_self_component_port_input_message_iterator *iterator = + struct bt_message_iterator *iterator = (void *) self_iterator; BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); @@ -554,7 +502,7 @@ void *bt_self_message_iterator_get_data( void bt_self_message_iterator_set_data( struct bt_self_message_iterator *self_iterator, void *data) { - struct bt_self_component_port_input_message_iterator *iterator = + struct bt_message_iterator *iterator = (void *) self_iterator; BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); @@ -581,7 +529,7 @@ void bt_self_message_iterator_configuration_set_can_seek_forward( BT_ASSERT_POST_DEV_FUNC static bool clock_snapshots_are_monotonic_one( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, const bt_message *msg) { const struct bt_clock_snapshot *clock_snapshot = NULL; @@ -606,7 +554,7 @@ bool clock_snapshots_are_monotonic_one( { struct bt_message_message_iterator_inactivity *inactivity_msg = (struct bt_message_message_iterator_inactivity *) msg; - clock_snapshot = inactivity_msg->default_cs; + clock_snapshot = inactivity_msg->cs; break; } case BT_MESSAGE_TYPE_PACKET_BEGINNING: @@ -642,8 +590,15 @@ bool clock_snapshots_are_monotonic_one( goto end; } - clock_snapshot_status = bt_clock_snapshot_get_ns_from_origin(clock_snapshot, &ns_from_origin); + clock_snapshot_status = bt_clock_snapshot_get_ns_from_origin( + clock_snapshot, &ns_from_origin); if (clock_snapshot_status != BT_FUNC_STATUS_OK) { + /* + * bt_clock_snapshot_get_ns_from_origin can return + * OVERFLOW_ERROR. We don't really want to report an error to + * our caller, so just clear it. + */ + bt_current_thread_clear_error(); goto end; } @@ -656,7 +611,7 @@ end: BT_ASSERT_POST_DEV_FUNC static bool clock_snapshots_are_monotonic( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, bt_message_array_const msgs, uint64_t msg_count) { uint64_t i; @@ -682,7 +637,7 @@ end: BT_ASSERT_POST_DEV_FUNC static -bool clock_classes_are_compatible_one(struct bt_self_component_port_input_message_iterator *iterator, +bool clock_classes_are_compatible_one(struct bt_message_iterator *iterator, const struct bt_message *msg) { enum bt_message_type message_type = bt_message_get_type(msg); @@ -816,7 +771,7 @@ end: BT_ASSERT_POST_DEV_FUNC static bool clock_classes_are_compatible( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, bt_message_array_const msgs, uint64_t msg_count) { uint64_t i; @@ -841,12 +796,12 @@ end: */ static -enum bt_component_class_message_iterator_next_method_status +enum bt_message_iterator_class_next_method_status call_iterator_next_method( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, bt_message_array_const msgs, uint64_t capacity, uint64_t *user_count) { - enum bt_component_class_message_iterator_next_method_status status; + enum bt_message_iterator_class_next_method_status status; BT_ASSERT_DBG(iterator->methods.next); BT_LOGD_STR("Calling user's \"next\" method."); @@ -861,21 +816,24 @@ call_iterator_next_method( "Clock snapshots are not monotonic"); } + BT_ASSERT_POST_DEV_NO_ERROR_IF_NO_ERROR_STATUS(status); + return status; } enum bt_message_iterator_next_status -bt_self_component_port_input_message_iterator_next( - struct bt_self_component_port_input_message_iterator *iterator, +bt_message_iterator_next( + struct bt_message_iterator *iterator, bt_message_array_const *msgs, uint64_t *user_count) { enum bt_message_iterator_next_status status = BT_FUNC_STATUS_OK; + BT_ASSERT_PRE_DEV_NO_ERROR(); BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); BT_ASSERT_PRE_DEV_NON_NULL(msgs, "Message array (output)"); BT_ASSERT_PRE_DEV_NON_NULL(user_count, "Message count (output)"); BT_ASSERT_PRE_DEV(iterator->state == - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE, + BT_MESSAGE_ITERATOR_STATE_ACTIVE, "Message iterator's \"next\" called, but " "message iterator is in the wrong state: %!+i", iterator); BT_ASSERT_DBG(iterator->upstream_component); @@ -917,7 +875,7 @@ bt_self_component_port_input_message_iterator_next( * have seeked (cannot seek a self message iterator). */ BT_ASSERT_DBG(iterator->state == - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE); + BT_MESSAGE_ITERATOR_STATE_ACTIVE); switch (status) { case BT_FUNC_STATUS_OK: @@ -930,12 +888,12 @@ bt_self_component_port_input_message_iterator_next( case BT_FUNC_STATUS_AGAIN: goto end; case BT_FUNC_STATUS_END: - set_self_comp_port_input_msg_iterator_state(iterator, - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED); + set_msg_iterator_state(iterator, + BT_MESSAGE_ITERATOR_STATE_ENDED); goto end; default: /* Unknown non-error status */ - abort(); + bt_common_abort(); } end: @@ -943,8 +901,8 @@ end: } struct bt_component * -bt_self_component_port_input_message_iterator_borrow_component( - struct bt_self_component_port_input_message_iterator *iterator) +bt_message_iterator_borrow_component( + struct bt_message_iterator *iterator) { BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); return iterator->upstream_component; @@ -953,7 +911,7 @@ bt_self_component_port_input_message_iterator_borrow_component( struct bt_self_component *bt_self_message_iterator_borrow_component( struct bt_self_message_iterator *self_iterator) { - struct bt_self_component_port_input_message_iterator *iterator = + struct bt_message_iterator *iterator = (void *) self_iterator; BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); @@ -963,7 +921,7 @@ struct bt_self_component *bt_self_message_iterator_borrow_component( struct bt_self_component_port_output *bt_self_message_iterator_borrow_port( struct bt_self_message_iterator *self_iterator) { - struct bt_self_component_port_input_message_iterator *iterator = + struct bt_message_iterator *iterator = (void *) self_iterator; BT_ASSERT_PRE_DEV_NON_NULL(iterator, "Message iterator"); @@ -971,12 +929,13 @@ struct bt_self_component_port_output *bt_self_message_iterator_borrow_port( } enum bt_message_iterator_can_seek_ns_from_origin_status -bt_self_component_port_input_message_iterator_can_seek_ns_from_origin( - struct bt_self_component_port_input_message_iterator *iterator, +bt_message_iterator_can_seek_ns_from_origin( + struct bt_message_iterator *iterator, int64_t ns_from_origin, bt_bool *can_seek) { enum bt_message_iterator_can_seek_ns_from_origin_status status; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); BT_ASSERT_PRE_NON_NULL(can_seek, "Result (output)"); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); @@ -999,6 +958,8 @@ bt_self_component_port_input_message_iterator_can_seek_ns_from_origin( status = (int) iterator->methods.can_seek_ns_from_origin(iterator, ns_from_origin, can_seek); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); + if (status != BT_FUNC_STATUS_OK) { BT_LIB_LOGW_APPEND_CAUSE( "Component input port message iterator's \"can seek nanoseconds from origin\" method failed: " @@ -1026,7 +987,7 @@ bt_self_component_port_input_message_iterator_can_seek_ns_from_origin( * iterator supports forward seeking then we can automatically seek to * any timestamp. */ - status = (int) bt_self_component_port_input_message_iterator_can_seek_beginning( + status = (int) bt_message_iterator_can_seek_beginning( iterator, can_seek); if (status != BT_FUNC_STATUS_OK) { goto end; @@ -1039,12 +1000,13 @@ end: } enum bt_message_iterator_can_seek_beginning_status -bt_self_component_port_input_message_iterator_can_seek_beginning( - struct bt_self_component_port_input_message_iterator *iterator, +bt_message_iterator_can_seek_beginning( + struct bt_message_iterator *iterator, bt_bool *can_seek) { enum bt_message_iterator_can_seek_beginning_status status; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); BT_ASSERT_PRE_NON_NULL(can_seek, "Result (output)"); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); @@ -1069,6 +1031,7 @@ bt_self_component_port_input_message_iterator_can_seek_beginning( *can_seek == BT_FALSE, "Unexpected boolean value returned from user's \"can seek beginning\" method: val=%d, %![iter-]+i", *can_seek, iterator); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); } else { *can_seek = BT_FALSE; status = BT_FUNC_STATUS_OK; @@ -1079,36 +1042,36 @@ bt_self_component_port_input_message_iterator_can_seek_beginning( static inline void set_iterator_state_after_seeking( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, int status) { - enum bt_self_component_port_input_message_iterator_state new_state = 0; + enum bt_message_iterator_state new_state = 0; /* Set iterator's state depending on seeking status */ switch (status) { case BT_FUNC_STATUS_OK: - new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE; + new_state = BT_MESSAGE_ITERATOR_STATE_ACTIVE; break; case BT_FUNC_STATUS_AGAIN: - new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN; + new_state = BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_AGAIN; break; case BT_FUNC_STATUS_ERROR: case BT_FUNC_STATUS_MEMORY_ERROR: - new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR; + new_state = BT_MESSAGE_ITERATOR_STATE_LAST_SEEKING_RETURNED_ERROR; break; case BT_FUNC_STATUS_END: - new_state = BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ENDED; + new_state = BT_MESSAGE_ITERATOR_STATE_ENDED; break; default: - abort(); + bt_common_abort(); } - set_self_comp_port_input_msg_iterator_state(iterator, new_state); + set_msg_iterator_state(iterator, new_state); } static void reset_iterator_expectations( - struct bt_self_component_port_input_message_iterator *iterator) + struct bt_message_iterator *iterator) { iterator->last_ns_from_origin = INT64_MIN; iterator->clock_expectation.type = CLOCK_EXPECTATION_UNSET; @@ -1116,12 +1079,12 @@ void reset_iterator_expectations( static bool message_iterator_can_seek_beginning( - struct bt_self_component_port_input_message_iterator *iterator) + struct bt_message_iterator *iterator) { enum bt_message_iterator_can_seek_beginning_status status; bt_bool can_seek; - status = bt_self_component_port_input_message_iterator_can_seek_beginning( + status = bt_message_iterator_can_seek_beginning( iterator, &can_seek); if (status != BT_FUNC_STATUS_OK) { can_seek = BT_FALSE; @@ -1131,11 +1094,12 @@ bool message_iterator_can_seek_beginning( } enum bt_message_iterator_seek_beginning_status -bt_self_component_port_input_message_iterator_seek_beginning( - struct bt_self_component_port_input_message_iterator *iterator) +bt_message_iterator_seek_beginning( + struct bt_message_iterator *iterator) { int status; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); BT_ASSERT_PRE( @@ -1153,8 +1117,8 @@ bt_self_component_port_input_message_iterator_seek_beginning( reset_iterator_expectations(iterator); BT_LIB_LOGD("Calling user's \"seek beginning\" method: %!+i", iterator); - set_self_comp_port_input_msg_iterator_state(iterator, - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_SEEKING); + set_msg_iterator_state(iterator, + BT_MESSAGE_ITERATOR_STATE_SEEKING); status = iterator->methods.seek_beginning(iterator); BT_LOGD("User method returned: status=%s", bt_common_func_status_string(status)); @@ -1164,6 +1128,7 @@ bt_self_component_port_input_message_iterator_seek_beginning( status == BT_FUNC_STATUS_AGAIN, "Unexpected status: %![iter-]+i, status=%s", iterator, bt_common_func_status_string(status)); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); if (status < 0) { BT_LIB_LOGW_APPEND_CAUSE( "Component input port message iterator's \"seek beginning\" method failed: " @@ -1176,8 +1141,8 @@ bt_self_component_port_input_message_iterator_seek_beginning( } bt_bool -bt_self_component_port_input_message_iterator_can_seek_forward( - bt_self_component_port_input_message_iterator *iterator) +bt_message_iterator_can_seek_forward( + bt_message_iterator *iterator) { BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); @@ -1258,7 +1223,7 @@ void destroy_auto_seek_stream_states(GHashTable *stream_states) static inline int auto_seek_handle_message( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, int64_t ns_from_origin, const struct bt_message *msg, bool *got_first, GHashTable *stream_states) { @@ -1287,7 +1252,7 @@ int auto_seek_handle_message( const struct bt_message_message_iterator_inactivity *inactivity_msg = (const void *) msg; - clk_snapshot = inactivity_msg->default_cs; + clk_snapshot = inactivity_msg->cs; BT_ASSERT_DBG(clk_snapshot); break; } @@ -1384,7 +1349,7 @@ int auto_seek_handle_message( break; } default: - abort(); + bt_common_abort(); } BT_ASSERT_DBG(clk_snapshot); @@ -1529,11 +1494,11 @@ end: static int find_message_ge_ns_from_origin( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, int64_t ns_from_origin, GHashTable *stream_states) { int status = BT_FUNC_STATUS_OK; - enum bt_self_component_port_input_message_iterator_state init_state = + enum bt_message_iterator_state init_state = iterator->state; const struct bt_message *messages[MSG_BATCH_SIZE]; uint64_t user_count = 0; @@ -1547,8 +1512,8 @@ int find_message_ge_ns_from_origin( * Make this iterator temporarily active (not seeking) to call * the "next" method. */ - set_self_comp_port_input_msg_iterator_state(iterator, - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE); + set_msg_iterator_state(iterator, + BT_MESSAGE_ITERATOR_STATE_ACTIVE); BT_ASSERT_DBG(iterator->methods.next); @@ -1573,7 +1538,7 @@ int find_message_ge_ns_from_origin( * would change the iterator's state. */ BT_ASSERT_DBG(iterator->state == - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_ACTIVE); + BT_MESSAGE_ITERATOR_STATE_ACTIVE); switch (status) { case BT_FUNC_STATUS_OK: @@ -1588,7 +1553,7 @@ int find_message_ge_ns_from_origin( case BT_FUNC_STATUS_END: goto end; default: - abort(); + bt_common_abort(); } for (i = 0; i < user_count; i++) { @@ -1618,7 +1583,7 @@ end: } } - set_self_comp_port_input_msg_iterator_state(iterator, init_state); + set_msg_iterator_state(iterator, init_state); return status; } @@ -1630,8 +1595,8 @@ end: */ static -enum bt_component_class_message_iterator_next_method_status post_auto_seek_next( - struct bt_self_component_port_input_message_iterator *iterator, +enum bt_message_iterator_class_next_method_status post_auto_seek_next( + struct bt_message_iterator *iterator, bt_message_array_const msgs, uint64_t capacity, uint64_t *count) { @@ -1675,13 +1640,13 @@ int clock_raw_value_from_ns_from_origin(const bt_clock_class *clock_class, static bool message_iterator_can_seek_ns_from_origin( - struct bt_self_component_port_input_message_iterator *iterator, + struct bt_message_iterator *iterator, int64_t ns_from_origin) { enum bt_message_iterator_can_seek_ns_from_origin_status status; bt_bool can_seek; - status = bt_self_component_port_input_message_iterator_can_seek_ns_from_origin( + status = bt_message_iterator_can_seek_ns_from_origin( iterator, ns_from_origin, &can_seek); if (status != BT_FUNC_STATUS_OK) { can_seek = BT_FALSE; @@ -1691,14 +1656,15 @@ bool message_iterator_can_seek_ns_from_origin( } enum bt_message_iterator_seek_ns_from_origin_status -bt_self_component_port_input_message_iterator_seek_ns_from_origin( - struct bt_self_component_port_input_message_iterator *iterator, +bt_message_iterator_seek_ns_from_origin( + struct bt_message_iterator *iterator, int64_t ns_from_origin) { int status; GHashTable *stream_states = NULL; bt_bool can_seek_by_itself; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); BT_ASSERT_PRE_ITER_HAS_STATE_TO_SEEK(iterator); BT_ASSERT_PRE( @@ -1711,8 +1677,8 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( message_iterator_can_seek_ns_from_origin(iterator, ns_from_origin), "Message iterator cannot seek nanoseconds from origin: %!+i, " "ns-from-origin=%" PRId64, iterator, ns_from_origin); - set_self_comp_port_input_msg_iterator_state(iterator, - BT_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_SEEKING); + set_msg_iterator_state(iterator, + BT_MESSAGE_ITERATOR_STATE_SEEKING); /* * We are seeking, reset our expectations about how the following @@ -1722,7 +1688,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( /* Check if the iterator can seek by itself. If not we'll use autoseek. */ if (iterator->methods.can_seek_ns_from_origin) { - bt_component_class_message_iterator_can_seek_ns_from_origin_method_status + bt_message_iterator_class_can_seek_ns_from_origin_method_status can_seek_status; can_seek_status = @@ -1751,6 +1717,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( status == BT_FUNC_STATUS_AGAIN, "Unexpected status: %![iter-]+i, status=%s", iterator, bt_common_func_status_string(status)); + BT_ASSERT_POST_NO_ERROR_IF_NO_ERROR_STATUS(status); if (status < 0) { BT_LIB_LOGW_APPEND_CAUSE( "Component input port message iterator's \"seek nanoseconds from origin\" method failed: " @@ -1763,8 +1730,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( * particular time. We will seek to the beginning and fast * forward to the right place. */ - enum bt_component_class_message_iterator_can_seek_beginning_method_status - can_seek_status; + enum bt_message_iterator_class_can_seek_beginning_method_status can_seek_status; bt_bool can_seek_beginning; can_seek_status = iterator->methods.can_seek_beginning(iterator, @@ -1798,7 +1764,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( case BT_FUNC_STATUS_AGAIN: goto end; default: - abort(); + bt_common_abort(); } /* @@ -1923,7 +1889,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( iterator->auto_seek.original_next_callback = iterator->methods.next; iterator->methods.next = - (bt_self_component_port_input_message_iterator_next_method) + (bt_message_iterator_next_method) post_auto_seek_next; } @@ -1942,7 +1908,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin( case BT_FUNC_STATUS_AGAIN: goto end; default: - abort(); + bt_common_abort(); } } @@ -1965,21 +1931,21 @@ end: bt_bool bt_self_message_iterator_is_interrupted( const struct bt_self_message_iterator *self_msg_iter) { - const struct bt_self_component_port_input_message_iterator *iterator = + const struct bt_message_iterator *iterator = (const void *) self_msg_iter; BT_ASSERT_PRE_NON_NULL(iterator, "Message iterator"); return (bt_bool) bt_graph_is_interrupted(iterator->graph); } -void bt_self_component_port_input_message_iterator_get_ref( - const struct bt_self_component_port_input_message_iterator *iterator) +void bt_message_iterator_get_ref( + const struct bt_message_iterator *iterator) { bt_object_get_ref(iterator); } -void bt_self_component_port_input_message_iterator_put_ref( - const struct bt_self_component_port_input_message_iterator *iterator) +void bt_message_iterator_put_ref( + const struct bt_message_iterator *iterator) { bt_object_put_ref(iterator); }