X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_mp_secondary.c;h=2ac33f781982c3d795788e050b44532ceba5dfda;hb=e847fc5128170c5cc2b729738eaf15b71bc859da;hp=9d7d28e5dc98537c4eb117d6a1e659cfa9b2ea88;hpb=3031749c2df04a63cdcef186dcce3781e61436e8;p=dpdk.git diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c index 9d7d28e5dc..2ac33f7819 100644 --- a/app/test/test_mp_secondary.c +++ b/app/test/test_mp_secondary.c @@ -1,52 +1,18 @@ -/*- - * 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 - * 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. +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2014 Intel Corporation */ #include #include "test.h" -#ifndef RTE_EXEC_ENV_BAREMETAL #include #include #include #include #include #include -#include -#include #include -#include -#include #include #include #include @@ -56,7 +22,6 @@ #include #include #include -#include #include #include #include @@ -85,29 +50,6 @@ #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 @@ -118,12 +60,16 @@ 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)); - rte_snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); + snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); +#else + const char *prefix = ""; +#endif /* good case, using secondary */ const char *argv1[] = { @@ -140,20 +86,24 @@ run_secondary_instances(void) 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; } @@ -223,7 +173,12 @@ run_object_creation_tests(void) #ifdef RTE_LIBRTE_LPM rte_errno=0; - if ((rte_lpm_create("test_lpm", size, rte_socket_id(), 0) != NULL) && + 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; @@ -231,14 +186,6 @@ run_object_creation_tests(void) printf("# Checked rte_lpm_create() OK\n"); #endif - /* 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"); - return 0; } @@ -251,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(); } @@ -264,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);