X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Futils%2Ftrimmer%2Fiterator.h;h=3b35dbd46a5bbce01a7ae30680be93bdd21badb8;hb=387483fca23fe90a5d2470581192049ef74ec3ec;hp=cca226db9b17fd79c518e04d66f1b651a76ebab7;hpb=64cadc660bbd0400df65da3534d28dbe59395ec7;p=babeltrace.git

diff --git a/plugins/utils/trimmer/iterator.h b/plugins/utils/trimmer/iterator.h
index cca226db..3b35dbd4 100644
--- a/plugins/utils/trimmer/iterator.h
+++ b/plugins/utils/trimmer/iterator.h
@@ -28,32 +28,30 @@
  */
 
 #include "trimmer.h"
-#include <babeltrace/component/notification/notification.h>
-#include <babeltrace/component/notification/iterator.h>
-#include <babeltrace/component/private-component.h>
-#include <babeltrace/component/private-port.h>
+#include <babeltrace/graph/notification.h>
+#include <babeltrace/graph/notification-iterator.h>
+#include <babeltrace/graph/private-component.h>
+#include <babeltrace/graph/private-port.h>
 
 struct trimmer_iterator {
 	/* Input iterator associated with this output iterator. */
 	struct bt_notification_iterator *input_iterator;
 	struct bt_notification *current_notification;
+	FILE *err;
+	/* Map between reader and writer packets. */
+	GHashTable *packet_map;
 };
 
 BT_HIDDEN
 enum bt_notification_iterator_status trimmer_iterator_init(
-		struct bt_private_component *component,
-		struct bt_private_port *port,
-		struct bt_private_notification_iterator *iterator);
+		struct bt_private_notification_iterator *iterator,
+		struct bt_private_port *port);
 
 BT_HIDDEN
 void trimmer_iterator_finalize(struct bt_private_notification_iterator *it);
 
 BT_HIDDEN
-struct bt_notification *trimmer_iterator_get(
-		struct bt_private_notification_iterator *iterator);
-
-BT_HIDDEN
-enum bt_notification_iterator_status trimmer_iterator_next(
+struct bt_notification_iterator_next_return trimmer_iterator_next(
 		struct bt_private_notification_iterator *iterator);
 
 BT_HIDDEN