X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_mp_secondary.c;h=2f941b5dc6e3333ddf5d518bcb01548d0461ff98;hb=99a5744147ea079828a52ee904ea79ba52602c16;hp=80099b3216d9265e824d5d4727d22c20b3c7116a;hpb=b6df9fc8715f9a925136006b18fdd65f9c621757;p=dpdk.git diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c index 80099b3216..2f941b5dc6 100644 --- a/app/test/test_mp_secondary.c +++ b/app/test/test_mp_secondary.c @@ -1,44 +1,40 @@ /*- * BSD LICENSE - * - * Copyright(c) 2010-2013 Intel Corporation. All rights reserved. + * + * 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 + * + * 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 -#include - #include "test.h" -#ifndef RTE_EXEC_ENV_BAREMETAL #include #include #include @@ -54,11 +50,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -70,9 +66,16 @@ #include #include #include + +#ifdef RTE_LIBRTE_HASH #include #include +#endif /* RTE_LIBRTE_HASH */ + +#ifdef RTE_LIBRTE_LPM #include +#endif /* RTE_LIBRTE_LPM */ + #include #include "process.h" @@ -80,6 +83,7 @@ #define launch_proc(ARGV) process_dup(ARGV, \ sizeof(ARGV)/(sizeof(ARGV[0])), __func__) +#ifdef RTE_EXEC_ENV_LINUXAPP static char* get_current_prefix(char * prefix, int size) { @@ -87,21 +91,23 @@ get_current_prefix(char * prefix, int size) char buf[PATH_MAX] = {0}; /* get file for config (fd is always 3) */ - rte_snprintf(path, sizeof(path), "/proc/self/fd/%d", 3); + 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)); + 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]); + snprintf(prefix, size, "%.*s", + (int)(strnlen(buf, sizeof(buf)) - sizeof("_config")), + &buf[1]); return prefix; } +#endif /* * This function is called in the primary i.e. main test, to spawn off secondary @@ -113,12 +119,16 @@ run_secondary_instances(void) int ret = 0; char coremask[10]; +#ifdef RTE_EXEC_ENV_LINUXAPP 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[] = { @@ -135,20 +145,24 @@ run_secondary_instances(void) prgname, "-c", coremask, "--proc-type=ERROR", prefix }; +#ifdef RTE_EXEC_ENV_LINUXAPP /* 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_LINUXAPP ret |= !(launch_proc(argv4)); +#endif return ret; } @@ -169,7 +183,7 @@ 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(), + 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"); @@ -196,6 +210,7 @@ run_object_creation_tests(void) } 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) && @@ -207,13 +222,15 @@ run_object_creation_tests(void) const struct rte_fbk_hash_params fbk_params = { .name = "test_fbk_mp_hash" }; rte_errno=0; - if ((rte_fbk_hash_create(&fbk_params) != NULL) && + 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(), 0) != NULL) && (rte_lpm_find_existing("test_lpm") == NULL)){ @@ -221,6 +238,7 @@ run_object_creation_tests(void) return -1; } printf("# Checked rte_lpm_create() OK\n"); +#endif /* Run a test_pci call */ if (test_pci() != 0) { @@ -255,16 +273,8 @@ 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 +static struct test_command multiprocess_cmd = { + .command = "multiprocess_autotest", + .callback = test_mp_secondary, +}; +REGISTER_TEST_COMMAND(multiprocess_cmd);