X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_pmd_ring.c;h=0d3d95c6758bade8dad44e6b987b2a4c85028c48;hb=3031749c2df04a63cdcef186dcce3781e61436e8;hp=4d9c2ba5a0923da0eaa1d5705dab0e89a9179f6e;hpb=4c39baf297d10c217e7d3e7370f26a1fede58308;p=dpdk.git

diff --git a/app/test/test_pmd_ring.c b/app/test/test_pmd_ring.c
index 4d9c2ba5a0..0d3d95c675 100644
--- a/app/test/test_pmd_ring.c
+++ b/app/test/test_pmd_ring.c
@@ -1,13 +1,13 @@
 /*-
  *   BSD LICENSE
- * 
+ *
  *   Copyright(c) 2010-2014 Intel Corporation. All rights reserved.
  *   All rights reserved.
- * 
+ *
  *   Redistribution and use in source and binary forms, with or without
  *   modification, are permitted provided that the following conditions
  *   are met:
- * 
+ *
  *     * Redistributions of source code must retain the above copyright
  *       notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above copyright
@@ -17,7 +17,7 @@
  *     * Neither the name of Intel Corporation nor the names of its
  *       contributors may be used to endorse or promote products derived
  *       from this software without specific prior written permission.
- * 
+ *
  *   THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
  *   "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
  *   LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
@@ -42,7 +42,6 @@
 /* two test rings, r1 is used by two ports, r2 just by one */
 static struct rte_ring *r1[2], *r2;
 
-static struct rte_ring *nullring = NULL;
 static struct rte_mempool *mp;
 static uint8_t start_idx; /* will store the port id of the first of our new ports */
 
@@ -59,58 +58,6 @@ static uint8_t start_idx; /* will store the port id of the first of our new port
 #define MBUF_SIZE (2048 + sizeof(struct rte_mbuf) + RTE_PKTMBUF_HEADROOM)
 #define NB_MBUF   512
 
-
-static int
-test_ring_ethdev_create(void)
-{
-	int retval;
-	printf("Testing ring pmd create\n");
-
-	retval = rte_eth_from_rings(NULL, 0, NULL, 0, SOCKET0);
-	if (retval < 0) {
-		printf("Failure, failed to create zero-sized RXTX ring pmd\n");
-		return -1;
-	}
-
-	retval = rte_eth_from_rings(NULL, 0, NULL, 0, RTE_MAX_NUMA_NODES);
-	if (retval >= 0) {
-		printf("Failure, can create ring pmd on socket %d\n", RTE_MAX_NUMA_NODES);
-		return -1;
-	}
-
-	retval = rte_eth_from_rings(NULL, 1, &r2, 1, SOCKET0);
-	if (retval >= 0) {
-		printf("Failure, can create pmd with null rx rings\n");
-		return -1;
-	}
-
-	retval = rte_eth_from_rings(r1, 1, NULL, 1, SOCKET0);
-	if (retval >= 0) {
-		printf("Failure, can create pmd with null tx rings\n");
-		return -1;
-	}
-
-	retval = rte_eth_from_rings(&nullring, 1, r1, 2, SOCKET0);
-	if (retval < 0) {
-		printf("Failure, failed to create TX-only ring pmd\n");
-		return -1;
-	}
-
-	retval = rte_eth_from_rings(r1, 1, &nullring, 1, SOCKET0);
-	if (retval < 0) {
-		printf("Failure, failed to create RX-only ring pmd\n");
-		return -1;
-	}
-
-	retval = rte_eth_from_rings(&r2, 1, &r2, 1, SOCKET0);
-	if (retval < 0) {
-		printf("Failure, failed to create RXTX ring pmd\n");
-		return -1;
-	}
-
-	return 0;
-}
-
 static int
 test_ethdev_configure(void)
 {
@@ -118,7 +65,7 @@ test_ethdev_configure(void)
 	struct rte_eth_link link;
 
 	memset(&null_conf, 0, sizeof(struct rte_eth_conf));
-	
+
 	if ((TX_PORT >= RTE_MAX_ETHPORTS) || (RX_PORT >= RTE_MAX_ETHPORTS)\
 		|| (RXTX_PORT >= RTE_MAX_ETHPORTS)) {
 		printf(" TX/RX port exceed max eth ports\n");
@@ -259,7 +206,7 @@ test_stats_reset(void)
 	printf("Testing ring PMD stats reset\n");
 
 	rte_eth_stats_reset(RXTX_PORT);
-	
+
 	/* check stats of RXTX port, should all be zero */
 	rte_eth_stats_get(RXTX_PORT, &stats);
 	if (stats.ipackets != 0 || stats.opackets != 0 ||
@@ -289,7 +236,7 @@ test_stats_reset(void)
 	}
 
 	rte_eth_stats_reset(RXTX_PORT);
-	
+
 	/* check stats of RXTX port, should all be zero */
 	rte_eth_stats_get(RXTX_PORT, &stats);
 	if (stats.ipackets != 0 || stats.opackets != 0 ||
@@ -302,29 +249,15 @@ test_stats_reset(void)
 	return 0;
 }
 
-static int 
+static int
 test_pmd_ring_init(void)
 {
-	const char * name1 = "R3";
-	const char * name2 = "R4";
-	const char * params_null = NULL;
-	const char * params = "PARAMS";
 	struct rte_eth_stats stats;
 	struct rte_mbuf buf, *pbuf = &buf;
 	struct rte_eth_conf null_conf;
 
 	printf("Testing ring pmd init\n");
 
-	if (rte_pmd_ring_devinit(name1, params_null) < 0) {
-		printf("Testing ring pmd init fail\n");
-		return -1;
-	}
-
-	if (rte_pmd_ring_devinit(name2, params) < 0) {
-		printf("Testing ring pmd init fail\n");
-		return -1;
-	}
-
 	if (RXTX_PORT2 >= RTE_MAX_ETHPORTS) {
 		printf(" TX/RX port exceed max eth ports\n");
 		return -1;
@@ -371,24 +304,16 @@ test_pmd_ring_init(void)
 
 	rte_eth_dev_stop(RXTX_PORT2);
 
-	/* Test init same name pmd ring */
-	rte_pmd_ring_devinit(name1, params_null);
 	return 0;
 }
 
 static int
 test_pmd_ring_pair_create(void)
 {
-	const char * name1 = "_RNG_P0";
 	struct rte_eth_stats stats, stats2;
 	struct rte_mbuf buf, *pbuf = &buf;
 	struct rte_eth_conf null_conf;
 
-	if (rte_eth_ring_pair_create(name1, SOCKET0) < 0) {
-		printf("Create ring pair failed\n");
-		return -1;
-	}
-
 	if ((RXTX_PORT4 >= RTE_MAX_ETHPORTS) || (RXTX_PORT5 >= RTE_MAX_ETHPORTS)) {
 		printf(" TX/RX port exceed max eth ports\n");
 		return -1;
@@ -405,13 +330,13 @@ test_pmd_ring_pair_create(void)
 		return -1;
 	}
 
-	if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) 
+	if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)
 		|| (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
 		printf("RX queue setup failed\n");
 		return -1;
 	}
 
-	if ((rte_eth_dev_start(RXTX_PORT4) < 0) 
+	if ((rte_eth_dev_start(RXTX_PORT4) < 0)
 		|| (rte_eth_dev_start(RXTX_PORT5) < 0)) {
 		printf("Error starting RXTX port\n");
 		return -1;
@@ -447,28 +372,16 @@ test_pmd_ring_pair_create(void)
 	rte_eth_dev_stop(RXTX_PORT4);
 	rte_eth_dev_stop(RXTX_PORT5);
 
-	/* Test create same name ring pair */
-	if (rte_eth_ring_pair_create(name1, SOCKET0) == 0) {
-		printf("Create same name ring pair error\n");
-		return -1;
-	}
 	return 0;
 }
 
 static int
 test_pmd_ring_pair_attach(void)
 {
-	const char * name1 = "_RNG_P0";
-	const char * name2 = "_RNG_P1";
 	struct rte_eth_stats stats, stats2;
 	struct rte_mbuf buf, *pbuf = &buf;
 	struct rte_eth_conf null_conf;
 
-	if (rte_eth_ring_pair_attach(name1, SOCKET0) < 0) {
-		printf("Attach ring pair failed\n");
-		return -1;
-	}
-
 	if ((RXTX_PORT4 >= RTE_MAX_ETHPORTS) || (RXTX_PORT5 >= RTE_MAX_ETHPORTS)) {
 		printf(" TX/RX port exceed max eth ports\n");
 		return -1;
@@ -485,18 +398,18 @@ test_pmd_ring_pair_attach(void)
 		return -1;
 	}
 
-	if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0) 
+	if ((rte_eth_rx_queue_setup(RXTX_PORT4, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)
 		|| (rte_eth_rx_queue_setup(RXTX_PORT5, 0, RING_SIZE, SOCKET0, NULL, mp) < 0)) {
 		printf("RX queue setup failed\n");
 		return -1;
 	}
 
-	if ((rte_eth_dev_start(RXTX_PORT4) < 0) 
+	if ((rte_eth_dev_start(RXTX_PORT4) < 0)
 		|| (rte_eth_dev_start(RXTX_PORT5) < 0)) {
 		printf("Error starting RXTX port\n");
 		return -1;
 	}
-	
+
 	rte_eth_stats_reset(RXTX_PORT4);
 	rte_eth_stats_reset(RXTX_PORT5);
 
@@ -528,12 +441,7 @@ test_pmd_ring_pair_attach(void)
 
 	rte_eth_dev_stop(RXTX_PORT4);
 	rte_eth_dev_stop(RXTX_PORT5);
-	
-	/* Test attach non-existing ring pair */
-	if (rte_eth_ring_pair_attach(name2, SOCKET0) == 0) {
-		printf("Attach non-existing ring pair error\n");
-		return -1;
-	}
+
 	return 0;
 }
 
@@ -568,9 +476,6 @@ test_pmd_ring(void)
 		return -1;
 	}
 
-	if (test_ring_ethdev_create() < 0)
-		return -1;
-
 	if (test_ethdev_configure() < 0)
 		return -1;
 
@@ -594,7 +499,7 @@ test_pmd_ring(void)
 		return -1;
 
 	if (test_pmd_ring_pair_attach() < 0)
-		return -1;	
+		return -1;
 	return 0;
 }