X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;f=app%2Ftest%2Ftest_mp_secondary.c;h=26c4afd67fd47b564f8b1fc6bff31f513f01d3b7;hb=26e09db6cb5fd9bbf0feb928561af9932694574b;hp=19af32c1ef80069574ffde23f49f5135032a22c8;hpb=1c1d4d7a923d4804f1926fc5264f9ecdd8977b04;p=dpdk.git diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c index 19af32c1ef..26c4afd67f 100644 --- a/app/test/test_mp_secondary.c +++ b/app/test/test_mp_secondary.c @@ -1,13 +1,13 @@ /*- * 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 * 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 @@ -33,11 +33,8 @@ #include -#include - #include "test.h" -#ifndef RTE_EXEC_ENV_BAREMETAL #include #include #include @@ -53,11 +50,11 @@ #include #include #include +#include #include #include #include -#include #include #include #include @@ -86,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) { @@ -93,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 @@ -119,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[] = { @@ -141,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; } @@ -175,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"); @@ -214,7 +222,7 @@ 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; @@ -224,7 +232,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; @@ -232,6 +245,7 @@ run_object_creation_tests(void) printf("# Checked rte_lpm_create() OK\n"); #endif +#ifdef RTE_APP_TEST_RESOURCE_TAR /* Run a test_pci call */ if (test_pci() != 0) { printf("PCI scan failed in secondary\n"); @@ -239,6 +253,7 @@ run_object_creation_tests(void) return -1; } else printf("PCI scan succeeded in secondary\n"); +#endif return 0; } @@ -253,9 +268,11 @@ test_mp_secondary(void) { if (rte_eal_process_type() == RTE_PROC_PRIMARY) { if (!test_pci_run) { +#ifdef RTE_APP_TEST_RESOURCE_TAR printf("=== Running pre-requisite test of test_pci\n"); test_pci(); printf("=== Requisite test done\n"); +#endif } return run_secondary_instances(); } @@ -265,16 +282,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);