From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Mon, 16 Jan 2017 17:52:11 +0000 (-0500)
Subject: Trimmer fix: forward evaluation result to downstream components
X-Git-Tag: v2.0.0-pre1~587
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=6d5f6792dd79d170fddcc98ac139a2cda730d377

Trimmer fix: forward evaluation result to downstream components

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/plugins/trimmer/iterator.c b/plugins/trimmer/iterator.c
index 133d63dd..0c6b2936 100644
--- a/plugins/trimmer/iterator.c
+++ b/plugins/trimmer/iterator.c
@@ -378,9 +378,6 @@ enum bt_notification_iterator_status evaluate_packet_notification(
 	 * packet.
 	 */
 	in_range = (pkt_end_ns >= begin_ns) && (pkt_begin_ns <= end_ns);
-	if (pkt_begin_ns > end_ns) {
-		ret = BT_NOTIFICATION_ITERATOR_STATUS_END;
-	}
 end:
 	*_packet_in_range = in_range;
 	bt_put(packet);
@@ -468,6 +465,10 @@ enum bt_notification_iterator_status trimmer_iterator_next(
 		} else {
 			bt_put(notification);
 		}
+
+		if (ret != BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+			break;
+		}
 	}
 end:
 	bt_put(source_it);