X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Futils%2Ftrimmer%2Ftrimmer.c;h=4e89581f59838a80fbbbb415825bbc1a6d6a7f4f;hb=8d8b141db4c46135a35be19e4a1c192f6a36d67b;hp=b18d976b0fe9ad8905de5307a8d6006d62ad7f3d;hpb=e803df70898ad94809e70156df2e6bdfd4b1ee2a;p=babeltrace.git

diff --git a/src/plugins/utils/trimmer/trimmer.c b/src/plugins/utils/trimmer/trimmer.c
index b18d976b..4e89581f 100644
--- a/src/plugins/utils/trimmer/trimmer.c
+++ b/src/plugins/utils/trimmer/trimmer.c
@@ -563,6 +563,7 @@ end:
 
 bt_component_class_init_method_status trimmer_init(
 		bt_self_component_filter *self_comp_flt,
+		bt_self_component_filter_configuration *config,
 		const bt_value *params, void *init_data)
 {
 	int ret;
@@ -663,6 +664,7 @@ void destroy_trimmer_iterator_stream_state(
 BT_HIDDEN
 bt_component_class_message_iterator_init_method_status trimmer_msg_iter_init(
 		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
 		bt_self_component_filter *self_comp,
 		bt_self_component_port_output *port)
 {
@@ -998,14 +1000,25 @@ bt_component_class_message_iterator_next_method_status state_seek_initially(
 		struct trimmer_iterator *trimmer_it)
 {
 	struct trimmer_comp *trimmer_comp = trimmer_it->trimmer_comp;
-	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;
 
 	BT_ASSERT(trimmer_it->begin.is_set);
 
 	if (trimmer_it->begin.is_infinite) {
-		if (!bt_self_component_port_input_message_iterator_can_seek_beginning(
-				trimmer_it->upstream_iter)) {
+		bt_bool can_seek;
+
+		status = (int) bt_self_component_port_input_message_iterator_can_seek_beginning(
+			trimmer_it->upstream_iter, &can_seek);
+		if (status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
+			if (status < 0) {
+				BT_COMP_LOGE_APPEND_CAUSE(trimmer_comp->self_comp,
+					"Cannot make upstream message iterator initially seek its beginning.");
+			}
+
+			goto end;
+		}
+
+		if (!can_seek) {
 			BT_COMP_LOGE_APPEND_CAUSE(trimmer_comp->self_comp,
 				"Cannot make upstream message iterator initially seek its beginning.");
 			status = BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_ERROR;
@@ -1015,9 +1028,23 @@ bt_component_class_message_iterator_next_method_status state_seek_initially(
 		status = (int) bt_self_component_port_input_message_iterator_seek_beginning(
 			trimmer_it->upstream_iter);
 	} else {
-		if (!bt_self_component_port_input_message_iterator_can_seek_ns_from_origin(
-				trimmer_it->upstream_iter,
-				trimmer_it->begin.ns_from_origin)) {
+		bt_bool can_seek;
+
+		status = (int) bt_self_component_port_input_message_iterator_can_seek_ns_from_origin(
+			trimmer_it->upstream_iter, trimmer_it->begin.ns_from_origin,
+			&can_seek);
+
+		if (status != BT_COMPONENT_CLASS_MESSAGE_ITERATOR_NEXT_METHOD_STATUS_OK) {
+			if (status < 0) {
+				BT_COMP_LOGE_APPEND_CAUSE(trimmer_comp->self_comp,
+					"Cannot make upstream message iterator initially seek: seek-ns-from-origin=%" PRId64,
+					trimmer_it->begin.ns_from_origin);
+			}
+
+			goto end;
+		}
+
+		if (!can_seek) {
 			BT_COMP_LOGE_APPEND_CAUSE(trimmer_comp->self_comp,
 				"Cannot make upstream message iterator initially seek: seek-ns-from-origin=%" PRId64,
 				trimmer_it->begin.ns_from_origin);