X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_mp_secondary.c;h=19af32c1ef80069574ffde23f49f5135032a22c8;hb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;hp=386e4890a7a12f1d141bc4980dc3a2c2fb033fa0;hpb=dada9ef6edc59015b6674b5a95258787c71401b0;p=dpdk.git

diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c
index 386e4890a7..19af32c1ef 100644
--- a/app/test/test_mp_secondary.c
+++ b/app/test/test_mp_secondary.c
@@ -1,35 +1,34 @@
 /*-
  *   BSD LICENSE
  * 
- *   Copyright(c) 2010-2012 Intel Corporation. All rights reserved.
+ *   Copyright(c) 2010-2013 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 
+ *   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 
+ *     * 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 
- *       notice, this list of conditions and the following disclaimer in 
- *       the documentation and/or other materials provided with the 
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in
+ *       the documentation and/or other materials provided with the
  *       distribution.
- *     * Neither the name of Intel Corporation nor the names of its 
- *       contributors may be used to endorse or promote products derived 
+ *     * 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 
- *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT 
- *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
- *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT 
- *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, 
- *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY 
- *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 
- *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ *   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
+ *   A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ *   OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ *   SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ *   LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ *   DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ *   THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ *   (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
  */
 
 #include <stdio.h>
@@ -52,6 +51,8 @@
 #include <stdarg.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <libgen.h>
+#include <dirent.h>
 
 #include <rte_common.h>
 #include <rte_memory.h>
@@ -66,12 +67,18 @@
 #include <rte_atomic.h>
 #include <rte_ring.h>
 #include <rte_debug.h>
-#include <stdarg.h>
 #include <rte_log.h>
 #include <rte_mempool.h>
+
+#ifdef RTE_LIBRTE_HASH
 #include <rte_hash.h>
 #include <rte_fbk_hash.h>
+#endif /* RTE_LIBRTE_HASH */
+
+#ifdef RTE_LIBRTE_LPM
 #include <rte_lpm.h>
+#endif /* RTE_LIBRTE_LPM */
+
 #include <rte_string_fns.h>
 
 #include "process.h"
@@ -79,6 +86,29 @@
 #define launch_proc(ARGV) process_dup(ARGV, \
 		sizeof(ARGV)/(sizeof(ARGV[0])), __func__)
 
+static char*
+get_current_prefix(char * prefix, int size)
+{
+	char path[PATH_MAX] = {0};
+	char buf[PATH_MAX] = {0};
+
+	/* get file for config (fd is always 3) */
+	rte_snprintf(path, sizeof(path), "/proc/self/fd/%d", 3);
+
+	/* return NULL on error */
+	if (readlink(path, buf, sizeof(buf)) == -1)
+		return NULL;
+
+	/* get the basename */
+	rte_snprintf(buf, sizeof(buf), "%s", basename(buf));
+
+	/* copy string all the way from second char up to start of _config */
+	rte_snprintf(prefix, size, "%.*s",
+			strnlen(buf, sizeof(buf)) - sizeof("_config"), &buf[1]);
+
+	return prefix;
+}
+
 /*
  * This function is called in the primary i.e. main test, to spawn off secondary
  * processes to run actual mp tests. Uses fork() and exec pair
@@ -89,17 +119,27 @@ run_secondary_instances(void)
 	int ret = 0;
 	char coremask[10];
 
+	char tmp[PATH_MAX] = {0};
+	char prefix[PATH_MAX] = {0};
+
+	get_current_prefix(tmp, sizeof(tmp));
+
+	rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+
 	/* good case, using secondary */
 	const char *argv1[] = {
-			prgname, "-c", coremask, "--proc-type=secondary"
+			prgname, "-c", coremask, "--proc-type=secondary",
+			prefix
 	};
 	/* good case, using auto */
 	const char *argv2[] = {
-			prgname, "-c", coremask, "--proc-type=auto"
+			prgname, "-c", coremask, "--proc-type=auto",
+			prefix
 	};
 	/* bad case, using invalid type */
 	const char *argv3[] = {
-			prgname, "-c", coremask, "--proc-type=ERROR"
+			prgname, "-c", coremask, "--proc-type=ERROR",
+			prefix
 	};
 	/* bad case, using invalid file prefix */
 	const char *argv4[]  = {
@@ -135,57 +175,62 @@ run_object_creation_tests(void)
 	printf("### Testing object creation - expect lots of mz reserve errors!\n");
 
 	rte_errno = 0;
-	if (rte_memzone_reserve("test_mz", size, rte_socket_id(), flags) != NULL
-			|| rte_errno != E_RTE_SECONDARY){
+	if ((rte_memzone_reserve("test_mz", size, rte_socket_id(), 
+				 flags) == NULL) &&
+	    (rte_memzone_lookup("test_mz") == NULL)) {
 		printf("Error: unexpected return value from rte_memzone_reserve\n");
 		return -1;
 	}
 	printf("# Checked rte_memzone_reserve() OK\n");
 
 	rte_errno = 0;
-	if (rte_ring_create("test_rng", size, rte_socket_id(), flags) != NULL
-			|| rte_errno != E_RTE_SECONDARY){
+	if ((rte_ring_create(
+		     "test_ring", size, rte_socket_id(), flags) == NULL) &&
+		    (rte_ring_lookup("test_ring") == NULL)){
 		printf("Error: unexpected return value from rte_ring_create()\n");
 		return -1;
 	}
 	printf("# Checked rte_ring_create() OK\n");
 
-
 	rte_errno = 0;
-	if (rte_mempool_create("test_mp", size, elt_size, cache_size,
-			priv_data_size, NULL, NULL, NULL, NULL,
-			rte_socket_id(), flags) != NULL
-			|| rte_errno != E_RTE_SECONDARY){
-		printf("Error: unexpected return value from rte_ring_create()\n");
+	if ((rte_mempool_create("test_mp", size, elt_size, cache_size,
+				priv_data_size, NULL, NULL, NULL, NULL,
+				rte_socket_id(), flags) == NULL) &&
+	     (rte_mempool_lookup("test_mp") == NULL)){
+		printf("Error: unexpected return value from rte_mempool_create()\n");
 		return -1;
 	}
 	printf("# Checked rte_mempool_create() OK\n");
 
+#ifdef RTE_LIBRTE_HASH
 	const struct rte_hash_parameters hash_params = { .name = "test_mp_hash" };
 	rte_errno=0;
-	if (rte_hash_create(&hash_params) != NULL
-			|| rte_errno != E_RTE_SECONDARY){
-		printf("Error: unexpected return value from rte_ring_create()\n");
+	if ((rte_hash_create(&hash_params) != NULL) &&
+	    (rte_hash_find_existing(hash_params.name) == NULL)){
+		printf("Error: unexpected return value from rte_hash_create()\n");
 		return -1;
 	}
 	printf("# Checked rte_hash_create() OK\n");
 
-	const struct rte_fbk_hash_params fbk_params = { .name = "test_mp_hash" };
+	const struct rte_fbk_hash_params fbk_params = { .name = "test_fbk_mp_hash" };
 	rte_errno=0;
-	if (rte_fbk_hash_create(&fbk_params) != NULL
-			|| rte_errno != E_RTE_SECONDARY){
-		printf("Error: unexpected return value from rte_ring_create()\n");
+	if ((rte_fbk_hash_create(&fbk_params) != NULL) && 
+	    (rte_fbk_hash_find_existing(fbk_params.name) == NULL)){
+		printf("Error: unexpected return value from rte_fbk_hash_create()\n");
 		return -1;
 	}
 	printf("# Checked rte_fbk_hash_create() OK\n");
+#endif
 
+#ifdef RTE_LIBRTE_LPM
 	rte_errno=0;
-	if (rte_lpm_create("test_lpm", size, rte_socket_id(), RTE_LPM_HEAP) != NULL
-			|| rte_errno != E_RTE_SECONDARY){
-		printf("Error: unexpected return value from rte_ring_create()\n");
+	if ((rte_lpm_create("test_lpm", size, rte_socket_id(), 0) != NULL) &&
+	    (rte_lpm_find_existing("test_lpm") == NULL)){
+		printf("Error: unexpected return value from rte_lpm_create()\n");
 		return -1;
 	}
 	printf("# Checked rte_lpm_create() OK\n");
+#endif
 
 	/* Run a test_pci call */
 	if (test_pci() != 0) {