api: pktio: rename pktio_send_queue to pktout_send

Now when old API has been removed, the new queue based send
function name can be shortened. Used prefix odp_pktout since
output queue type is odp_pktout_queue_t and all other API calls
related to output queues are prefixed with odp_pktout_queue (not
odp_pktio_).

Renamed:
odp_pktio_send_queue() => odp_pktout_send()

Signed-off-by: Petri Savolainen <petri.savolainen@nokia.com>
Reviewed-and-tested-by: Bill Fischofer <bill.fischofer@linaro.org>
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

4 files changed, 18 insertions, 20 deletions

diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index efe450adc..72869d521 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -316,7 +316,7 @@ static void *run_worker_sched_mode(void *arg)
 		/* packets from the same queue are from the same interface */
 		dst_idx = lookup_dest_port(pkt_tbl[0]);
 		fill_eth_addrs(pkt_tbl, pkts, dst_idx);
-		sent = odp_pktio_send_queue(pktout[dst_idx], pkt_tbl, pkts);
+		sent = odp_pktout_send(pktout[dst_idx], pkt_tbl, pkts);
 
 		sent     = odp_unlikely(sent < 0) ? 0 : sent;
 		tx_drops = pkts - sent;
@@ -405,7 +405,7 @@ static void *run_worker_plain_queue_mode(void *arg)
 
 		fill_eth_addrs(pkt_tbl, pkts, dst_idx);
 
-		sent = odp_pktio_send_queue(pktout, pkt_tbl, pkts);
+		sent = odp_pktout_send(pktout, pkt_tbl, pkts);
 
 		sent     = odp_unlikely(sent < 0) ? 0 : sent;
 		tx_drops = pkts - sent;
@@ -491,7 +491,7 @@ static void *run_worker_direct_mode(void *arg)
 
 		fill_eth_addrs(pkt_tbl, pkts, dst_idx);
 
-		sent = odp_pktio_send_queue(pktout, pkt_tbl, pkts);
+		sent = odp_pktout_send(pktout, pkt_tbl, pkts);
 
 		sent     = odp_unlikely(sent < 0) ? 0 : sent;
 		tx_drops = pkts - sent;
diff --git a/test/performance/odp_pktio_perf.c b/test/performance/odp_pktio_perf.c
index cc855fe1a..5ffc542e2 100644
--- a/test/performance/odp_pktio_perf.c
+++ b/test/performance/odp_pktio_perf.c
@@ -281,7 +281,7 @@ static int send_packets(odp_pktout_queue_t pktout,
 	while (sent < pkts) {
 		int ret;
 
-		ret = odp_pktio_send_queue(pktout, &pkt_tbl[sent], pkts - sent);
+		ret = odp_pktout_send(pktout, &pkt_tbl[sent], pkts - sent);
 
 		if (odp_likely(ret > 0))
 			sent += ret;
diff --git a/test/validation/classification/odp_classification_common.c b/test/validation/classification/odp_classification_common.c
index 6a88e269f..e06d0a962 100644
--- a/test/validation/classification/odp_classification_common.c
+++ b/test/validation/classification/odp_classification_common.c
@@ -170,7 +170,7 @@ void enqueue_pktio_interface(odp_packet_t pkt, odp_pktio_t pktio)
 	odp_pktout_queue_t pktout;
 
 	CU_ASSERT_FATAL(odp_pktout_queue(pktio, &pktout, 1) == 1);
-	CU_ASSERT(odp_pktio_send_queue(pktout, &pkt, 1) == 1);
+	CU_ASSERT(odp_pktout_send(pktout, &pkt, 1) == 1);
 }
 
 odp_packet_t receive_packet(odp_queue_t *queue, uint64_t ns)
diff --git a/test/validation/pktio/pktio.c b/test/validation/pktio/pktio.c
index 2413d0ddb..ff2100f83 100644
--- a/test/validation/pktio/pktio.c
+++ b/test/validation/pktio/pktio.c
@@ -433,7 +433,7 @@ static int send_packets(odp_pktout_queue_t pktout,
 	unsigned sent = 0;
 
 	while (sent < pkts) {
-		ret = odp_pktio_send_queue(pktout, &pkt_tbl[sent], pkts - sent);
+		ret = odp_pktout_send(pktout, &pkt_tbl[sent], pkts - sent);
 
 		if (ret < 0) {
 			CU_FAIL_FATAL("failed to send test packet");
@@ -481,8 +481,7 @@ static void pktio_txrx_multi(pktio_info_t *pktio_a, pktio_info_t *pktio_b,
 	/* send packet(s) out */
 	if (mode == TXRX_MODE_SINGLE) {
 		for (i = 0; i < num_pkts; ++i) {
-			ret = odp_pktio_send_queue(pktio_a->pktout,
-						   &tx_pkt[i], 1);
+			ret = odp_pktout_send(pktio_a->pktout, &tx_pkt[i], 1);
 			if (ret != 1) {
 				CU_FAIL_FATAL("failed to send test packet");
 				odp_packet_free(tx_pkt[i]);
@@ -679,8 +678,8 @@ void pktio_test_recv_queue(void)
 	if (num_queues > MAX_QUEUES)
 		num_queues = MAX_QUEUES;
 
-	ret = odp_pktio_send_queue(pktout_queue[num_queues - 1], pkt_tbl,
-				   TX_BATCH_LEN);
+	ret = odp_pktout_send(pktout_queue[num_queues - 1], pkt_tbl,
+			      TX_BATCH_LEN);
 	CU_ASSERT_FATAL(ret == TX_BATCH_LEN);
 
 	/* Receive packets */
@@ -1118,7 +1117,7 @@ void pktio_test_statistics_counters(void)
 
 	/* send */
 	for (pkts = 0; pkts != alloc; ) {
-		ret = odp_pktio_send_queue(pktout, &tx_pkt[pkts], alloc - pkts);
+		ret = odp_pktout_send(pktout, &tx_pkt[pkts], alloc - pkts);
 		if (ret < 0) {
 			CU_FAIL("unable to send packet\n");
 			break;
@@ -1227,8 +1226,8 @@ void pktio_test_start_stop(void)
 		}
 
 		for (pkts = 0; pkts != alloc; ) {
-			ret = odp_pktio_send_queue(pktout, &tx_pkt[pkts],
-						   alloc - pkts);
+			ret = odp_pktout_send(pktout, &tx_pkt[pkts],
+					      alloc - pkts);
 			if (ret < 0) {
 				CU_FAIL("unable to enqueue packet\n");
 				break;
@@ -1294,7 +1293,7 @@ void pktio_test_start_stop(void)
 
 	/* send */
 	for (pkts = 0; pkts != alloc; ) {
-		ret = odp_pktio_send_queue(pktout, &tx_pkt[pkts], alloc - pkts);
+		ret = odp_pktout_send(pktout, &tx_pkt[pkts], alloc - pkts);
 		if (ret < 0) {
 			CU_FAIL("unable to enqueue packet\n");
 			break;
@@ -1441,7 +1440,7 @@ void pktio_test_send_failure(void)
 		/* try to send the batch with the long packet in the middle,
 		 * the initial short packets should be sent successfully */
 		odp_errno_zero();
-		ret = odp_pktio_send_queue(pktout, pkt_tbl, TX_BATCH_LEN);
+		ret = odp_pktout_send(pktout, pkt_tbl, TX_BATCH_LEN);
 		CU_ASSERT_FATAL(ret == long_pkt_idx);
 		CU_ASSERT(odp_errno() == 0);
 
@@ -1456,9 +1455,9 @@ void pktio_test_send_failure(void)
 			/* now try to send starting with the too-long packet
 			 * and verify it fails */
 			odp_errno_zero();
-			ret = odp_pktio_send_queue(pktout,
-						   &pkt_tbl[long_pkt_idx],
-						   TX_BATCH_LEN - long_pkt_idx);
+			ret = odp_pktout_send(pktout,
+					      &pkt_tbl[long_pkt_idx],
+					      TX_BATCH_LEN - long_pkt_idx);
 			CU_ASSERT(ret == -1);
 			CU_ASSERT(odp_errno() != 0);
 		} else {
@@ -1478,8 +1477,7 @@ void pktio_test_send_failure(void)
 		CU_ASSERT_FATAL(ret == 0);
 
 		CU_ASSERT_FATAL(pkt_seq[i] != TEST_SEQ_INVALID);
-		ret = odp_pktio_send_queue(pktout, &pkt_tbl[i],
-					   TX_BATCH_LEN - i);
+		ret = odp_pktout_send(pktout, &pkt_tbl[i], TX_BATCH_LEN - i);
 		CU_ASSERT_FATAL(ret == (TX_BATCH_LEN - i));
 
 		i = wait_for_packets(&info_rx, &pkt_tbl[i], &pkt_seq[i], ret,