X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Fgraph%2Fiterator.c;h=3ef5fd57d226a6e17d7a69157dedf79a1831fec7;hb=ec60bdaad9d1a8baf6710ba2e8fd2c02c0d0eeea;hp=6dc3ba98266d37fe88f94d4e617b1a3fc36113bf;hpb=d6f6a5aa1207fc66091bb6cc8d6fe376d89328ac;p=babeltrace.git

diff --git a/src/lib/graph/iterator.c b/src/lib/graph/iterator.c
index 6dc3ba98..3ef5fd57 100644
--- a/src/lib/graph/iterator.c
+++ b/src/lib/graph/iterator.c
@@ -170,18 +170,24 @@ void bt_self_component_port_input_message_iterator_try_finalize(
 {
 	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,35 +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) {
+		method_t method = NULL;
+		struct bt_component_class *comp_class =
+			iterator->upstream_component->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;
+		switch (comp_class->type) {
+		case BT_COMPONENT_CLASS_TYPE_SOURCE:
+		{
+			struct bt_component_class_source *src_comp_cls =
+				(void *) comp_class;
 
-		method = (method_t) flt_comp_cls->methods.msg_iter_finalize;
-		break;
-	}
-	default:
-		/* Unreachable */
-		bt_common_abort();
-	}
+			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;
 
-	if (method) {
-		BT_LIB_LOGD("Calling user's finalization method: %!+i",
-			iterator);
-		method(iterator);
+			method = (method_t) flt_comp_cls->methods.msg_iter_finalize;
+			break;
+		}
+		default:
+			/* Unreachable */
+			bt_common_abort();
+		}
+
+		if (method) {
+			const bt_error *saved_error;
+
+			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 */
@@ -527,6 +546,7 @@ bt_self_component_port_input_message_iterator_create_from_message_iterator(
 		struct bt_self_component_port_input *input_port,
 		struct bt_self_component_port_input_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);
@@ -538,6 +558,7 @@ bt_self_component_port_input_message_iterator_create_from_sink_component(
 		struct bt_self_component_port_input *input_port,
 		struct bt_self_component_port_input_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);
@@ -882,6 +903,7 @@ bt_self_component_port_input_message_iterator_next(
 {
 	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)");
@@ -988,6 +1010,7 @@ bt_self_component_port_input_message_iterator_can_seek_ns_from_origin(
 {
 	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);
@@ -1058,6 +1081,7 @@ bt_self_component_port_input_message_iterator_can_seek_beginning(
 {
 	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);
@@ -1150,6 +1174,7 @@ bt_self_component_port_input_message_iterator_seek_beginning(
 {
 	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(
@@ -1714,6 +1739,7 @@ bt_self_component_port_input_message_iterator_seek_ns_from_origin(
 	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(