X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Fmuxer%2Fmuxer.c;h=f4af51c8df083765e2242c1f80d39810fb355733;hb=5ca9cc5a82576446a98b36519f143039025519db;hp=1571167cbea31e485a1a13ef8abd13a56815714f;hpb=f331468c193c14544df578174185b01af900abcf;p=babeltrace.git

diff --git a/src/plugins/utils/muxer/muxer.c b/src/plugins/utils/muxer/muxer.c
index 1571167c..f4af51c8 100644
--- a/src/plugins/utils/muxer/muxer.c
+++ b/src/plugins/utils/muxer/muxer.c
@@ -107,6 +107,14 @@ struct muxer_msg_iter {
 	 * MUXER_MSG_ITER_CLOCK_CLASS_EXPECTATION_NOT_ABS_SPEC_UUID.
 	 */
 	bt_uuid_t expected_clock_class_uuid;
+
+	/*
+	 * Saved error.  If we hit an error in the _next method, but have some
+	 * messages ready to return, we save the error here and return it on
+	 * the next _next call.
+	 */
+	bt_component_class_message_iterator_next_method_status next_saved_status;
+	const struct bt_error *next_saved_error;
 };
 
 static
@@ -247,6 +255,7 @@ void destroy_muxer_comp(struct muxer_comp *muxer_comp)
 	g_free(muxer_comp);
 }
 
+static
 struct bt_param_validation_map_value_entry_descr muxer_params[] = {
 	BT_PARAM_VALIDATION_MAP_VALUE_ENTRY_END
 };
@@ -1101,17 +1110,27 @@ bt_component_class_message_iterator_next_method_status muxer_msg_iter_do_next(
 		bt_message_array_const msgs, uint64_t capacity,
 		uint64_t *count)
 {
-	bt_component_class_message_iterator_next_method_status status =
-		BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
+	bt_component_class_message_iterator_next_method_status status;
 	uint64_t i = 0;
 
-	while (i < capacity && status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
+	if (G_UNLIKELY(muxer_msg_iter->next_saved_error)) {
+		/*
+		 * Last time we were called, we hit an error but had some
+		 * messages to deliver, so we stashed the error here.  Return
+		 * it now.
+		 */
+		BT_CURRENT_THREAD_MOVE_ERROR_AND_RESET(muxer_msg_iter->next_saved_error);
+		status = muxer_msg_iter->next_saved_status;
+		goto end;
+	}
+
+	do {
 		status = muxer_msg_iter_do_next_one(muxer_comp,
 			muxer_msg_iter, &msgs[i]);
 		if (status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
 			i++;
 		}
-	}
+	} while (i < capacity && status == BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK);
 
 	if (i > 0) {
 		/*
@@ -1126,10 +1145,23 @@ bt_component_class_message_iterator_next_method_status muxer_msg_iter_do_next(
 		 * called, possibly without any accumulated
 		 * message, in which case we'll return it.
 		 */
+		if (status < 0) {
+			/*
+			 * Save this error for the next _next call.  Assume that
+			 * this component always appends error causes when
+			 * returning an error status code, which will cause the
+			 * current thread error to be non-NULL.
+			 */
+			muxer_msg_iter->next_saved_error = bt_current_thread_take_error();
+			BT_ASSERT(muxer_msg_iter->next_saved_error);
+			muxer_msg_iter->next_saved_status = status;
+		}
+
 		*count = i;
 		status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK;
 	}
 
+end:
 	return status;
 }