X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fiterator.c;h=4dd69c6ae69477c26b54ac35e3c22b2033c79ef0;hb=a3f0c7db90f4cfc81090a83a7442b7bc624d5789;hp=a0a88199a0627c8a1eb6cf335f242c4700b9bf4d;hpb=42a6316598eda35c8f23f8afbf579e385dc6de40;p=babeltrace.git diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c index a0a88199..4dd69c6a 100644 --- a/src/lib/graph/iterator.c +++ b/src/lib/graph/iterator.c @@ -69,6 +69,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" @@ -169,19 +170,24 @@ void bt_self_component_port_input_message_iterator_try_finalize( struct bt_self_component_port_input_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; + /* + * 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_SELF_COMPONENT_PORT_INPUT_MESSAGE_ITERATOR_STATE_FINALIZED: /* Already finalized */ BT_LIB_LOGD("Not finalizing message iterator: already finalized: " @@ -200,42 +206,48 @@ void bt_self_component_port_input_message_iterator_try_finalize( set_self_comp_port_input_msg_iterator_state(iterator, BT_SELF_COMPONENT_PORT_INPUT_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 = NULL; + struct bt_component_class *comp_class = + iterator->upstream_component->class; + + switch (comp_class->type) { + case BT_COMPONENT_CLASS_TYPE_SOURCE: + { + struct bt_component_class_source *src_comp_cls = + (void *) comp_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; + method = (method_t) src_comp_cls->msg_iter_cls->methods.finalize; + break; + } + case BT_COMPONENT_CLASS_TYPE_FILTER: + { + struct bt_component_class_filter *flt_comp_cls = + (void *) comp_class; - method = (method_t) flt_comp_cls->methods.msg_iter_finalize; - break; - } - default: - /* Unreachable */ - bt_common_abort(); - } + method = (method_t) flt_comp_cls->msg_iter_cls->methods.finalize; + break; + } + default: + /* Unreachable */ + bt_common_abort(); + } - if (method) { - const bt_error *saved_error; + if (method) { + const bt_error *saved_error; - saved_error = bt_current_thread_take_error(); + saved_error = bt_current_thread_take_error(); - BT_LIB_LOGD("Calling user's finalization method: %!+i", - iterator); - method(iterator); + BT_LIB_LOGD("Calling user's finalization method: %!+i", + iterator); + method(iterator); - if (saved_error) { - BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error); + if (saved_error) { + BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(saved_error); + } } } @@ -307,10 +319,7 @@ int create_self_component_input_port_message_iterator( struct bt_self_component_port_input *self_port, struct bt_self_component_port_input_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; + bt_message_iterator_class_initialize_method init_method = NULL; struct bt_self_component_port_input_message_iterator *iterator = NULL; struct bt_self_component_port_input_message_iterator *downstream_msg_iter = @@ -398,19 +407,19 @@ int create_self_component_input_port_message_iterator( iterator->methods.next = (bt_self_component_port_input_message_iterator_next_method) - src_comp_cls->methods.msg_iter_next; + src_comp_cls->msg_iter_cls->methods.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; + src_comp_cls->msg_iter_cls->methods.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; + src_comp_cls->msg_iter_cls->methods.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; + src_comp_cls->msg_iter_cls->methods.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; + src_comp_cls->msg_iter_cls->methods.can_seek_beginning; break; } case BT_COMPONENT_CLASS_TYPE_FILTER: @@ -420,19 +429,19 @@ int create_self_component_input_port_message_iterator( iterator->methods.next = (bt_self_component_port_input_message_iterator_next_method) - flt_comp_cls->methods.msg_iter_next; + flt_comp_cls->msg_iter_cls->methods.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; + flt_comp_cls->msg_iter_cls->methods.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; + flt_comp_cls->msg_iter_cls->methods.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; + flt_comp_cls->msg_iter_cls->methods.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; + flt_comp_cls->msg_iter_cls->methods.can_seek_beginning; break; } default: @@ -459,8 +468,7 @@ int create_self_component_input_port_message_iterator( struct bt_component_class_source *src_comp_cls = (void *) upstream_comp_cls; - init_method = - (init_method_t) src_comp_cls->methods.msg_iter_initialize; + init_method = src_comp_cls->msg_iter_cls->methods.initialize; break; } case BT_COMPONENT_CLASS_TYPE_FILTER: @@ -468,8 +476,7 @@ int create_self_component_input_port_message_iterator( struct bt_component_class_filter *flt_comp_cls = (void *) upstream_comp_cls; - init_method = - (init_method_t) flt_comp_cls->methods.msg_iter_initialize; + init_method = flt_comp_cls->msg_iter_cls->methods.initialize; break; } default: @@ -478,11 +485,14 @@ int create_self_component_input_port_message_iterator( } 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 *) upstream_comp, + (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); @@ -860,12 +870,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, 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."); @@ -1659,7 +1669,7 @@ end: */ static -enum bt_component_class_message_iterator_next_method_status post_auto_seek_next( +enum bt_message_iterator_class_next_method_status post_auto_seek_next( struct bt_self_component_port_input_message_iterator *iterator, bt_message_array_const msgs, uint64_t capacity, uint64_t *count) @@ -1752,7 +1762,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 = @@ -1794,8 +1804,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,