X-Git-Url: http://drtracing.org/?a=blobdiff_plain;f=tests%2Fplugins%2Ftest-utils-muxer.c;h=6600a72e8f183caeb5fec509fa562d6e7e784ecf;hb=73d5c1adb1411e16c9c613c38a4c74a29ee608ae;hp=c1aff68a407d8e2da8a53f343bde09f52a5859e8;hpb=11b4920caf6cb8d9549a7393cbc0340a1a686ac3;p=babeltrace.git

diff --git a/tests/plugins/test-utils-muxer.c b/tests/plugins/test-utils-muxer.c
index c1aff68a..6600a72e 100644
--- a/tests/plugins/test-utils-muxer.c
+++ b/tests/plugins/test-utils-muxer.c
@@ -591,11 +591,15 @@ static
 struct bt_notification_iterator_next_return src_iter_next(
 		struct bt_private_notification_iterator *priv_iterator)
 {
-	struct bt_notification_iterator_next_return next_return;
+	struct bt_notification_iterator_next_return next_return = {
+		.notification = NULL,
+		.status = BT_NOTIFICATION_ITERATOR_STATUS_OK,
+	};
 	struct src_iter_user_data *user_data =
 		bt_private_notification_iterator_get_user_data(priv_iterator);
 	struct bt_private_component *private_component =
 		bt_private_notification_iterator_get_private_component(priv_iterator);
+	int ret;
 
 	assert(user_data);
 	assert(private_component);
@@ -634,16 +638,12 @@ struct bt_notification_iterator_next_return src_iter_next(
 		break;
 	case TEST_SINGLE_END_THEN_MULTIPLE_FULL:
 		if (user_data->iter_index == 0) {
-			struct bt_private_port *priv_port;
-
-			priv_port = bt_private_component_source_add_output_private_port(
-				private_component, "out1", NULL);
-			assert(priv_port);
-			bt_put(priv_port);
-			priv_port = bt_private_component_source_add_output_private_port(
-				private_component, "out2", NULL);
-			assert(priv_port);
-			bt_put(priv_port);
+			ret = bt_private_component_source_add_output_private_port(
+				private_component, "out1", NULL, NULL);
+			assert(ret == 0);
+			ret = bt_private_component_source_add_output_private_port(
+				private_component, "out2", NULL, NULL);
+			assert(ret == 0);
 			next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_END;
 		} else {
 			next_return = src_iter_next_seq(user_data);
@@ -655,16 +655,12 @@ struct bt_notification_iterator_next_return src_iter_next(
 				next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_AGAIN;
 				user_data->at++;
 			} else {
-				struct bt_private_port *priv_port;
-
-				priv_port = bt_private_component_source_add_output_private_port(
-					private_component, "out1", NULL);
-				assert(priv_port);
-				bt_put(priv_port);
-				priv_port = bt_private_component_source_add_output_private_port(
-					private_component, "out2", NULL);
-				assert(priv_port);
-				bt_put(priv_port);
+				ret = bt_private_component_source_add_output_private_port(
+					private_component, "out1", NULL, NULL);
+				assert(ret == 0);
+				ret = bt_private_component_source_add_output_private_port(
+					private_component, "out2", NULL, NULL);
+				assert(ret == 0);
 				next_return.status = BT_NOTIFICATION_ITERATOR_STATUS_END;
 			}
 		} else {
@@ -684,7 +680,7 @@ enum bt_component_status src_init(
 		struct bt_private_component *private_component,
 		struct bt_value *params, void *init_method_data)
 {
-	struct bt_private_port *priv_port;
+	int ret;
 	size_t nb_ports;
 
 	switch (current_test) {
@@ -701,31 +697,27 @@ enum bt_component_status src_init(
 	}
 
 	if (nb_ports >= 1) {
-		priv_port = bt_private_component_source_add_output_private_port(
-			private_component, "out0", NULL);
-		assert(priv_port);
-		bt_put(priv_port);
+		ret = bt_private_component_source_add_output_private_port(
+			private_component, "out0", NULL, NULL);
+		assert(ret == 0);
 	}
 
 	if (nb_ports >= 2) {
-		priv_port = bt_private_component_source_add_output_private_port(
-			private_component, "out1", NULL);
-		assert(priv_port);
-		bt_put(priv_port);
+		ret = bt_private_component_source_add_output_private_port(
+			private_component, "out1", NULL, NULL);
+		assert(ret == 0);
 	}
 
 	if (nb_ports >= 3) {
-		priv_port = bt_private_component_source_add_output_private_port(
-			private_component, "out2", NULL);
-		assert(priv_port);
-		bt_put(priv_port);
+		ret = bt_private_component_source_add_output_private_port(
+			private_component, "out2", NULL, NULL);
+		assert(ret == 0);
 	}
 
 	if (nb_ports >= 4) {
-		priv_port = bt_private_component_source_add_output_private_port(
-			private_component, "out3", NULL);
-		assert(priv_port);
-		bt_put(priv_port);
+		ret = bt_private_component_source_add_output_private_port(
+			private_component, "out3", NULL, NULL);
+		assert(ret == 0);
 	}
 
 	return BT_COMPONENT_STATUS_OK;
@@ -879,13 +871,13 @@ void sink_port_connected(struct bt_private_component *private_component,
 		bt_private_port_get_private_connection(self_private_port);
 	struct sink_user_data *user_data = bt_private_component_get_user_data(
 		private_component);
+	enum bt_connection_status conn_status;
 
 	assert(user_data);
 	assert(priv_conn);
-	user_data->notif_iter =
-		bt_private_connection_create_notification_iterator(priv_conn,
-			NULL);
-	assert(user_data->notif_iter);
+	conn_status = bt_private_connection_create_notification_iterator(
+		priv_conn, NULL, &user_data->notif_iter);
+	assert(conn_status == 0);
 	bt_put(priv_conn);
 }
 
@@ -896,16 +888,14 @@ enum bt_component_status sink_init(
 {
 	struct sink_user_data *user_data = g_new0(struct sink_user_data, 1);
 	int ret;
-	void *priv_port;
 
 	assert(user_data);
 	ret = bt_private_component_set_user_data(private_component,
 		user_data);
 	assert(ret == 0);
-	priv_port = bt_private_component_sink_add_input_private_port(
-		private_component, "in", NULL);
-	assert(priv_port);
-	bt_put(priv_port);
+	ret = bt_private_component_sink_add_input_private_port(
+		private_component, "in", NULL, NULL);
+	assert(ret == 0);
 	return BT_COMPONENT_STATUS_OK;
 }
 
@@ -985,7 +975,6 @@ void do_std_test(enum test test, const char *name,
 	struct bt_graph *graph;
 	int64_t i;
 	int64_t count;
-	void *conn;
 	enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
 
 	clear_test_events();
@@ -1007,10 +996,9 @@ void do_std_test(enum test test, const char *name,
 			downstream_port = bt_component_filter_get_input_port_by_index(
 				muxer_comp, i);
 			assert(downstream_port);
-			conn = bt_graph_connect_ports(graph,
-				upstream_port, downstream_port);
-			assert(conn);
-			bt_put(conn);
+			graph_status = bt_graph_connect_ports(graph,
+				upstream_port, downstream_port, NULL);
+			assert(graph_status == 0);
 			bt_put(upstream_port);
 			bt_put(downstream_port);
 		}
@@ -1022,9 +1010,9 @@ void do_std_test(enum test test, const char *name,
 	assert(upstream_port);
 	downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
 	assert(downstream_port);
-	conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
-	assert(conn);
-	bt_put(conn);
+	graph_status = bt_graph_connect_ports(graph, upstream_port,
+		downstream_port, NULL);
+	assert(graph_status == 0);
 	bt_put(upstream_port);
 	bt_put(downstream_port);
 
@@ -1342,9 +1330,9 @@ void connect_port_to_first_avail_muxer_port(struct bt_graph *graph,
 		struct bt_component *muxer_comp)
 {
 	struct bt_port *avail_muxer_port = NULL;
-	void *conn;
 	int64_t i;
 	int64_t count;
+	enum bt_graph_status graph_status;
 
 	count = bt_component_filter_get_input_port_count(muxer_comp);
 	assert(count >= 0);
@@ -1364,9 +1352,9 @@ void connect_port_to_first_avail_muxer_port(struct bt_graph *graph,
 		}
 	}
 
-	conn = bt_graph_connect_ports(graph, source_port, avail_muxer_port);
-	assert(conn);
-	bt_put(conn);
+	graph_status = bt_graph_connect_ports(graph, source_port,
+		avail_muxer_port, NULL);
+	assert(graph_status == 0);
 	bt_put(avail_muxer_port);
 }
 
@@ -1402,7 +1390,6 @@ void test_single_end_then_multiple_full(void)
 	struct bt_graph *graph;
 	int64_t i;
 	int64_t count;
-	void *conn;
 	int ret;
 	enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
 	struct graph_listener_data graph_listener_data;
@@ -1477,7 +1464,7 @@ void test_single_end_then_multiple_full(void)
 	ret = bt_graph_add_port_added_listener(graph,
 		graph_port_added_listener_connect_to_avail_muxer_port,
 		&graph_listener_data);
-	assert(ret == 0);
+	assert(ret >= 0);
 
 	/* Connect source output ports to muxer input ports */
 	count = bt_component_source_get_output_port_count(src_comp);
@@ -1498,9 +1485,9 @@ void test_single_end_then_multiple_full(void)
 	assert(upstream_port);
 	downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
 	assert(downstream_port);
-	conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
-	assert(conn);
-	bt_put(conn);
+	graph_status = bt_graph_connect_ports(graph, upstream_port,
+		downstream_port, NULL);
+	assert(graph_status == 0);
 	bt_put(upstream_port);
 	bt_put(downstream_port);
 
@@ -1530,7 +1517,6 @@ void test_single_again_end_then_multiple_full(void)
 	struct bt_graph *graph;
 	int64_t i;
 	int64_t count;
-	void *conn;
 	int ret;
 	enum bt_graph_status graph_status = BT_GRAPH_STATUS_OK;
 	struct graph_listener_data graph_listener_data;
@@ -1606,7 +1592,7 @@ void test_single_again_end_then_multiple_full(void)
 	ret = bt_graph_add_port_added_listener(graph,
 		graph_port_added_listener_connect_to_avail_muxer_port,
 		&graph_listener_data);
-	assert(ret == 0);
+	assert(ret >= 0);
 
 	/* Connect source output ports to muxer input ports */
 	count = bt_component_source_get_output_port_count(src_comp);
@@ -1627,9 +1613,9 @@ void test_single_again_end_then_multiple_full(void)
 	assert(upstream_port);
 	downstream_port = bt_component_sink_get_input_port_by_name(sink_comp, "in");
 	assert(downstream_port);
-	conn = bt_graph_connect_ports(graph, upstream_port, downstream_port);
-	assert(conn);
-	bt_put(conn);
+	graph_status = bt_graph_connect_ports(graph, upstream_port,
+		downstream_port, NULL);
+	assert(graph_status == 0);
 	bt_put(upstream_port);
 	bt_put(downstream_port);