X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_mp_secondary.c;h=2ac33f781982c3d795788e050b44532ceba5dfda;hb=3a22f3877c9d8b13d7d1cdbd4c130b38cdbc8bcb;hp=c40a508cadaf4b5fefd622574c8155ff8c2dc954;hpb=af75078fece3615088e561357c1e97603e43a5fe;p=dpdk.git

diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c
index c40a508cad..2ac33f7819 100644
--- a/app/test/test_mp_secondary.c
+++ b/app/test/test_mp_secondary.c
@@ -1,63 +1,27 @@
-/*-
- *   BSD LICENSE
- * 
- *   Copyright(c) 2010-2012 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 
- *       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 
- *       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 
- *   OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- * 
- *  version: DPDK.L.1.2.3-3
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(c) 2010-2014 Intel Corporation
  */
 
 #include <stdio.h>
 
-#include <cmdline_parse.h>
-
 #include "test.h"
 
-#ifndef RTE_EXEC_ENV_BAREMETAL
 #include <stdint.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <inttypes.h>
 #include <sys/queue.h>
 #include <errno.h>
-#include <stdarg.h>
-#include <inttypes.h>
 #include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
 #include <unistd.h>
 #include <sys/wait.h>
+#include <libgen.h>
+#include <dirent.h>
+#include <limits.h>
 
 #include <rte_common.h>
 #include <rte_memory.h>
 #include <rte_memzone.h>
-#include <rte_tailq.h>
 #include <rte_eal.h>
 #include <rte_launch.h>
 #include <rte_per_lcore.h>
@@ -67,12 +31,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"
@@ -90,32 +60,50 @@ run_secondary_instances(void)
 	int ret = 0;
 	char coremask[10];
 
+#ifdef RTE_EXEC_ENV_LINUX
+	char tmp[PATH_MAX] = {0};
+	char prefix[PATH_MAX] = {0};
+
+	get_current_prefix(tmp, sizeof(tmp));
+
+	snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp);
+#else
+	const char *prefix = "";
+#endif
+
 	/* 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
 	};
+#ifdef RTE_EXEC_ENV_LINUX
 	/* bad case, using invalid file prefix */
 	const char *argv4[]  = {
 			prgname, "-c", coremask, "--proc-type=secondary",
 					"--file-prefix=ERROR"
 	};
+#endif
 
-	rte_snprintf(coremask, sizeof(coremask), "%x", \
+	snprintf(coremask, sizeof(coremask), "%x", \
 			(1 << rte_get_master_lcore()));
 
 	ret |= launch_proc(argv1);
 	ret |= launch_proc(argv2);
 
 	ret |= !(launch_proc(argv3));
+#ifdef RTE_EXEC_ENV_LINUX
 	ret |= !(launch_proc(argv4));
+#endif
 
 	return ret;
 }
@@ -136,65 +124,67 @@ 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");
+	struct rte_lpm_config config;
+
+	config.max_rules = rte_socket_id();
+	config.number_tbl8s = 256;
+	config.flags = 0;
+	if ((rte_lpm_create("test_lpm", size, &config) != 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");
-
-	/* Run a test_pci call */
-	if (test_pci() != 0) {
-		printf("PCI scan failed in secondary\n");
-		if (getuid() == 0) /* pci scans can fail as non-root */
-			return -1;
-	} else
-		printf("PCI scan succeeded in secondary\n");
+#endif
 
 	return 0;
 }
@@ -208,11 +198,6 @@ int
 test_mp_secondary(void)
 {
 	if (rte_eal_process_type() == RTE_PROC_PRIMARY) {
-		if (!test_pci_run) {
-			printf("=== Running pre-requisite test of test_pci\n");
-			test_pci();
-			printf("=== Requisite test done\n");
-		}
 		return run_secondary_instances();
 	}
 
@@ -221,16 +206,4 @@ test_mp_secondary(void)
 	return run_object_creation_tests();
 }
 
-#else
-
-/* Baremetal version
- * Multiprocess not applicable, so just return 0 always
- */
-int
-test_mp_secondary(void)
-{
-	printf("Multi-process not applicable for baremetal\n");
-	return 0;
-}
-
-#endif
+REGISTER_TEST_COMMAND(multiprocess_autotest, test_mp_secondary);