X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Flib%2Ftest_graph_topo.c;h=185c6c2259c601c0e255acc1de4bb37009a0ca4b;hb=5c5632787fc9cafa602c89a28966bcfd01ec0204;hp=6f81bdb885e2220815ccbb5e4f3748308c9854f0;hpb=90157d89276ed1a569a2d4ffcfeed0b415817c12;p=babeltrace.git

diff --git a/tests/lib/test_graph_topo.c b/tests/lib/test_graph_topo.c
index 6f81bdb8..185c6c22 100644
--- a/tests/lib/test_graph_topo.c
+++ b/tests/lib/test_graph_topo.c
@@ -17,6 +17,7 @@
  * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
+#include <babeltrace/ref.h>
 #include <babeltrace/graph/component-class.h>
 #include <babeltrace/graph/component-class-source.h>
 #include <babeltrace/graph/component-class-sink.h>
@@ -303,14 +304,12 @@ enum bt_component_status accept_port_connection(
 	struct event event = {
 		.type = COMP_ACCEPT_PORT_CONNECTION,
 		.data.comp_accept_port_connection = {
-			.comp = bt_component_from_private_component(private_component),
-			.self_port = bt_port_from_private_port(self_private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.self_port = bt_port_borrow_from_private(self_private_port),
 			.other_port = other_port,
 		},
 	};
 
-	bt_put(event.data.comp_accept_port_connection.comp);
-	bt_put(event.data.comp_accept_port_connection.self_port);
 	append_event(&event);
 	return BT_COMPONENT_STATUS_OK;
 }
@@ -325,14 +324,12 @@ void src_port_connected(struct bt_private_component *private_component,
 	struct event event = {
 		.type = COMP_PORT_CONNECTED,
 		.data.comp_port_connected = {
-			.comp = bt_component_from_private_component(private_component),
-			.self_port = bt_port_from_private_port(self_private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.self_port = bt_port_borrow_from_private(self_private_port),
 			.other_port = other_port,
 		},
 	};
 
-	bt_put(event.data.comp_port_connected.comp);
-	bt_put(event.data.comp_port_connected.self_port);
 	append_event(&event);
 
 	switch (current_test) {
@@ -354,13 +351,11 @@ void src_port_disconnected(struct bt_private_component *private_component,
 	struct event event = {
 		.type = COMP_PORT_DISCONNECTED,
 		.data.comp_port_disconnected = {
-			.comp = bt_component_from_private_component(private_component),
-			.port = bt_port_from_private_port(private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.port = bt_port_borrow_from_private(private_port),
 		},
 	};
 
-	bt_put(event.data.comp_port_disconnected.comp);
-	bt_put(event.data.comp_port_disconnected.port);
 	append_event(&event);
 
 	switch (current_test) {
@@ -416,14 +411,12 @@ void sink_port_connected(struct bt_private_component *private_component,
 	struct event event = {
 		.type = COMP_PORT_CONNECTED,
 		.data.comp_port_connected = {
-			.comp = bt_component_from_private_component(private_component),
-			.self_port = bt_port_from_private_port(self_private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.self_port = bt_port_borrow_from_private(self_private_port),
 			.other_port = other_port,
 		},
 	};
 
-	bt_put(event.data.comp_port_connected.comp);
-	bt_put(event.data.comp_port_connected.self_port);
 	append_event(&event);
 }
 
@@ -434,13 +427,11 @@ void sink_port_disconnected(struct bt_private_component *private_component,
 	struct event event = {
 		.type = COMP_PORT_DISCONNECTED,
 		.data.comp_port_disconnected = {
-			.comp = bt_component_from_private_component(private_component),
-			.port = bt_port_from_private_port(private_port),
+			.comp = bt_component_borrow_from_private(private_component),
+			.port = bt_port_borrow_from_private(private_port),
 		},
 	};
 
-	bt_put(event.data.comp_port_disconnected.comp);
-	bt_put(event.data.comp_port_disconnected.port);
 	append_event(&event);
 }