From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sat, 17 Dec 2016 16:05:26 +0000 (-0500)
Subject: Stop trimmer iteration when end bound is reached
X-Git-Tag: v2.0.0-pre1~594
X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=commitdiff_plain;h=c2535354eab5dbcf8e283b955bd67852a0d2c411

Stop trimmer iteration when end bound is reached

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

diff --git a/plugins/trimmer/iterator.c b/plugins/trimmer/iterator.c
index e80bb34e..133d63dd 100644
--- a/plugins/trimmer/iterator.c
+++ b/plugins/trimmer/iterator.c
@@ -260,6 +260,7 @@ evaluate_event_notification(struct bt_notification *notification,
 	}
 	if (end->set && ts > end->value) {
 		in_range = false;
+		ret = BT_NOTIFICATION_ITERATOR_STATUS_END;
 	}
 end:
 	bt_put(event);
@@ -377,6 +378,9 @@ 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);