X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=include%2Fbabeltrace%2Fgraph%2Fnotification-iterator-internal.h;h=dd80a5192b595f1199415df706ce6c057f87bde2;hb=3fea54f69edd1780566230255da196cb6e82df62;hp=55aa4e6210d09942c493d62ec9524b60aec1960c;hpb=6ac74c0c883983329e958a1e0580ecde29985c76;p=babeltrace.git

diff --git a/include/babeltrace/graph/notification-iterator-internal.h b/include/babeltrace/graph/notification-iterator-internal.h
index 55aa4e62..dd80a519 100644
--- a/include/babeltrace/graph/notification-iterator-internal.h
+++ b/include/babeltrace/graph/notification-iterator-internal.h
@@ -28,7 +28,6 @@
 
 #include <babeltrace/babeltrace-internal.h>
 #include <babeltrace/object-internal.h>
-#include <babeltrace/ref-internal.h>
 #include <babeltrace/graph/connection.h>
 #include <babeltrace/graph/notification.h>
 #include <babeltrace/graph/notification-iterator.h>
@@ -87,7 +86,6 @@ enum bt_private_connection_notification_iterator_state {
 struct bt_notification_iterator {
 	struct bt_object base;
 	enum bt_notification_iterator_type type;
-	struct bt_notification *current_notification; /* owned by this */
 };
 
 struct bt_notification_iterator_private_connection {
@@ -95,6 +93,7 @@ struct bt_notification_iterator_private_connection {
 	struct bt_component *upstream_component; /* Weak */
 	struct bt_port *upstream_port; /* Weak */
 	struct bt_connection *connection; /* Weak */
+	struct bt_graph *graph; /* Weak */
 
 	/*
 	 * This hash table keeps the state of a stream as viewed by
@@ -124,34 +123,10 @@ struct bt_notification_iterator_output_port {
 	struct bt_notification_iterator base;
 	struct bt_graph *graph; /* Owned by this */
 	struct bt_component *colander; /* Owned by this */
-	struct bt_port *output_port; /* Owned by this */
-};
 
-static inline
-struct bt_notification *bt_notification_iterator_borrow_current_notification(
-		struct bt_notification_iterator *iterator)
-{
-	BT_ASSERT(iterator);
-	return iterator->current_notification;
-}
-
-static inline
-void bt_notification_iterator_replace_current_notification(
-		struct bt_notification_iterator *iterator,
-		struct bt_notification *notification)
-{
-	BT_ASSERT(iterator);
-	bt_put(iterator->current_notification);
-	iterator->current_notification = bt_get(notification);
-}
-
-static inline
-struct bt_notification_iterator_private_connection *
-bt_private_connection_notification_iterator_borrow_from_private(
-		struct bt_private_connection_private_notification_iterator *private_notification_iterator)
-{
-	return (void *) private_notification_iterator;
-}
+	/* Only used temporarily: should always be NULL */
+	struct bt_notification *notif;
+};
 
 static inline
 struct bt_private_connection_private_notification_iterator *