summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
authorBruce Richardson <bruce.richardson@intel.com>2019-03-06 16:22:40 +0000
committerThomas Monjalon <thomas@monjalon.net>2019-03-12 23:01:14 +0100
commit5fbc1d498f548026cfdcd63f28330d687761f2a3 (patch)
treeb43958d810fc45feb6db494b153bb6396154487f /app
parent742bde12f3bd008c2f06d744330436d8b1a56720 (diff)
downloaddpdk-next-eventdev-5fbc1d498f548026cfdcd63f28330d687761f2a3.zip
dpdk-next-eventdev-5fbc1d498f548026cfdcd63f28330d687761f2a3.tar.gz
dpdk-next-eventdev-5fbc1d498f548026cfdcd63f28330d687761f2a3.tar.xz
build/freebsd: rename macro BSDPAPP to FREEBSD
Rename the macro and all instances in DPDK code, but keep a copy of the old macro defined for legacy code linking against DPDK Signed-off-by: Bruce Richardson <bruce.richardson@intel.com>
Diffstat (limited to 'app')
-rw-r--r--app/test-bbdev/test_bbdev_vector.c2
-rw-r--r--app/test-crypto-perf/cperf_test_vector_parsing.c2
-rw-r--r--app/test-pmd/testpmd.c2
-rw-r--r--app/test/process.h2
-rw-r--r--app/test/test_alarm.c2
-rw-r--r--app/test/test_eal_flags.c32
-rw-r--r--app/test/test_eal_fs.c2
-rw-r--r--app/test/test_errno.c2
-rw-r--r--app/test/test_mempool.c2
9 files changed, 24 insertions, 24 deletions
diff --git a/app/test-bbdev/test_bbdev_vector.c b/app/test-bbdev/test_bbdev_vector.c
index 45fe999..e4f68e2 100644
--- a/app/test-bbdev/test_bbdev_vector.c
+++ b/app/test-bbdev/test_bbdev_vector.c
@@ -2,7 +2,7 @@
* Copyright(c) 2017 Intel Corporation
*/
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
#define _WITH_GETLINE
#endif
#include <stdio.h>
diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.c b/app/test-crypto-perf/cperf_test_vector_parsing.c
index 92932a2..1e9dfcf 100644
--- a/app/test-crypto-perf/cperf_test_vector_parsing.c
+++ b/app/test-crypto-perf/cperf_test_vector_parsing.c
@@ -1,7 +1,7 @@
/* SPDX-License-Identifier: BSD-3-Clause
* Copyright(c) 2016-2017 Intel Corporation
*/
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
#define _WITH_GETLINE
#endif
#include <stdio.h>
diff --git a/app/test-pmd/testpmd.c b/app/test-pmd/testpmd.c
index 98c1baa..d9d0c16 100644
--- a/app/test-pmd/testpmd.c
+++ b/app/test-pmd/testpmd.c
@@ -3125,7 +3125,7 @@ main(int argc, char** argv)
#endif
/* on FreeBSD, mlockall() is disabled by default */
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
do_mlockall = 0;
#else
do_mlockall = 1;
diff --git a/app/test/process.h b/app/test/process.h
index 998d653..2701127 100644
--- a/app/test/process.h
+++ b/app/test/process.h
@@ -11,7 +11,7 @@
#include <unistd.h> /* readlink */
#include <sys/wait.h>
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
#define self "curproc"
#define exe "file"
#else
diff --git a/app/test/test_alarm.c b/app/test/test_alarm.c
index d1284b3..951b7f0 100644
--- a/app/test/test_alarm.c
+++ b/app/test/test_alarm.c
@@ -178,7 +178,7 @@ static int
test_alarm(void)
{
int count = 0;
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
printf("The alarm API is not supported on FreeBSD\n");
return 0;
#endif
diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c
index e286410..1a64b09 100644
--- a/app/test/test_eal_flags.c
+++ b/app/test/test_eal_flags.c
@@ -231,7 +231,7 @@ static int
test_whitelist_flag(void)
{
unsigned i;
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -297,7 +297,7 @@ test_whitelist_flag(void)
static int
test_invalid_b_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -344,7 +344,7 @@ test_invalid_b_flag(void)
static int
test_invalid_vdev_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point, and we also need to
* run another primary process here */
const char * prefix = no_shconf;
@@ -398,7 +398,7 @@ test_invalid_vdev_flag(void)
static int
test_invalid_r_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -442,7 +442,7 @@ test_invalid_r_flag(void)
static int
test_missing_c_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -592,7 +592,7 @@ test_missing_c_flag(void)
static int
test_master_lcore_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char *prefix = "";
#else
@@ -640,7 +640,7 @@ test_master_lcore_flag(void)
static int
test_invalid_n_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -690,7 +690,7 @@ test_no_hpet_flag(void)
{
char prefix[PATH_MAX] = "";
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
return 0;
#else
char tmp[PATH_MAX];
@@ -724,7 +724,7 @@ test_no_hpet_flag(void)
static int
test_no_huge_flag(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point, and we also need to
* run another primary process here */
const char * prefix = no_shconf;
@@ -752,7 +752,7 @@ test_no_huge_flag(void)
printf("Error - process did not run ok with --no-huge and -m flags\n");
return -1;
}
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target does not support NUMA, hence no --socket-mem tests */
return 0;
#endif
@@ -774,7 +774,7 @@ static int
test_misc_flags(void)
{
char hugepath[PATH_MAX] = {0};
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
const char * nosh_prefix = "";
@@ -898,7 +898,7 @@ test_misc_flags(void)
return -1;
}
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* no more tests to be done on FreeBSD */
return 0;
#endif
@@ -978,7 +978,7 @@ test_file_prefix(void)
*/
char prefix[PATH_MAX] = "";
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
return 0;
#else
if (get_current_prefix(prefix, sizeof(prefix)) == NULL) {
@@ -1138,7 +1138,7 @@ test_file_prefix(void)
static int
test_memory_flags(void)
{
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD target doesn't support prefixes at this point */
const char * prefix = "";
#else
@@ -1191,7 +1191,7 @@ test_memory_flags(void)
char invalid_socket_mem[SOCKET_MEM_STRLEN];
char buf[SOCKET_MEM_STRLEN]; /* to avoid copying string onto itself */
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
int i, num_sockets = 1;
#else
int i, num_sockets = RTE_MIN(get_number_of_sockets(),
@@ -1247,7 +1247,7 @@ test_memory_flags(void)
return -1;
}
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* no other tests are applicable to BSD */
return 0;
#endif
diff --git a/app/test/test_eal_fs.c b/app/test/test_eal_fs.c
index 7ca2164..cae624f 100644
--- a/app/test/test_eal_fs.c
+++ b/app/test/test_eal_fs.c
@@ -22,7 +22,7 @@ test_parse_sysfs_value(void)
unsigned valid_number;
unsigned long retval = 0;
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD doesn't have /proc/pid/fd */
return 0;
#endif
diff --git a/app/test/test_errno.c b/app/test/test_errno.c
index 920a2cf..7df8192 100644
--- a/app/test/test_errno.c
+++ b/app/test/test_errno.c
@@ -18,7 +18,7 @@ test_errno(void)
{
const char *rte_retval;
const char *libc_retval;
-#ifdef RTE_EXEC_ENV_BSDAPP
+#ifdef RTE_EXEC_ENV_FREEBSD
/* BSD has a colon in the string, unlike linux */
const char unknown_code_result[] = "Unknown error: %d";
#else
diff --git a/app/test/test_mempool.c b/app/test/test_mempool.c
index eebb1f2..7738c73 100644
--- a/app/test/test_mempool.c
+++ b/app/test/test_mempool.c
@@ -116,7 +116,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache)
MEMPOOL_HEADER_SIZE(mp, mp->cache_size))
GOTO_ERR(ret, out);
-#ifndef RTE_EXEC_ENV_BSDAPP /* rte_mem_virt2iova() not supported on bsd */
+#ifndef RTE_EXEC_ENV_FREEBSD /* rte_mem_virt2iova() not supported on bsd */
printf("get physical address of an object\n");
if (rte_mempool_virt2iova(obj) != rte_mem_virt2iova(obj))
GOTO_ERR(ret, out);