From: Bruce Richardson Date: Wed, 6 Mar 2019 16:22:39 +0000 (+0000) Subject: build/linux: rename macro from LINUXAPP to LINUX X-Git-Url: http://git.droids-corp.org/?a=commitdiff_plain;h=742bde12f3bd;p=dpdk.git build/linux: rename macro from LINUXAPP to LINUX Rename the macro to make things shorter and more comprehensible. For both meson and make builds, keep the old macro around for backward compatibility. Signed-off-by: Bruce Richardson --- diff --git a/app/test/process.h b/app/test/process.h index 7f62f644f0..998d653165 100644 --- a/app/test/process.h +++ b/app/test/process.h @@ -82,7 +82,7 @@ process_dup(const char *const argv[], int numargs, const char *env_value) /* FreeBSD doesn't support file prefixes, so force compile failures for any * tests attempting to use this function on FreeBSD. */ -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX static char * get_current_prefix(char *prefix, int size) { diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index 81e345b879..e2864107cf 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -190,7 +190,7 @@ end: return result; } -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX /* * count the number of "node*" files in /sys/devices/system/node/ */ diff --git a/app/test/test_interrupts.c b/app/test/test_interrupts.c index 4e82e9a22d..d8c2d8124a 100644 --- a/app/test/test_interrupts.c +++ b/app/test/test_interrupts.c @@ -31,7 +31,7 @@ static struct rte_intr_handle intr_handles[TEST_INTERRUPT_HANDLE_MAX]; static enum test_interrupt_handle_type test_intr_type = TEST_INTERRUPT_HANDLE_MAX; -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX union intr_pipefds{ struct { int pipefd[2]; @@ -169,7 +169,7 @@ test_interrupt_handle_compare(struct rte_intr_handle *intr_handle_l, return 0; } -#endif /* RTE_EXEC_ENV_LINUXAPP */ +#endif /* RTE_EXEC_ENV_LINUX */ /** * Callback for the test interrupt. diff --git a/app/test/test_kni.c b/app/test/test_kni.c index c92c09054f..7a65de179b 100644 --- a/app/test/test_kni.c +++ b/app/test/test_kni.c @@ -11,7 +11,7 @@ #include "test.h" -#if !defined(RTE_EXEC_ENV_LINUXAPP) || !defined(RTE_LIBRTE_KNI) +#if !defined(RTE_EXEC_ENV_LINUX) || !defined(RTE_LIBRTE_KNI) static int test_kni(void) diff --git a/app/test/test_mp_secondary.c b/app/test/test_mp_secondary.c index b597dfcdf1..2ac33f7819 100644 --- a/app/test/test_mp_secondary.c +++ b/app/test/test_mp_secondary.c @@ -60,7 +60,7 @@ run_secondary_instances(void) int ret = 0; char coremask[10]; -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX char tmp[PATH_MAX] = {0}; char prefix[PATH_MAX] = {0}; @@ -86,7 +86,7 @@ run_secondary_instances(void) prgname, "-c", coremask, "--proc-type=ERROR", prefix }; -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX /* bad case, using invalid file prefix */ const char *argv4[] = { prgname, "-c", coremask, "--proc-type=secondary", @@ -101,7 +101,7 @@ run_secondary_instances(void) ret |= launch_proc(argv2); ret |= !(launch_proc(argv3)); -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX ret |= !(launch_proc(argv4)); #endif diff --git a/app/test/test_pdump.c b/app/test/test_pdump.c index 4a894c0e1b..af206968b3 100644 --- a/app/test/test_pdump.c +++ b/app/test/test_pdump.c @@ -172,7 +172,7 @@ run_pdump_server_tests(void) int ret = 0; char coremask[10]; -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX char tmp[PATH_MAX] = { 0 }; char prefix[PATH_MAX] = { 0 }; diff --git a/app/test/test_timer_perf.c b/app/test/test_timer_perf.c index 0fe2b74cd7..0ede4b3e40 100644 --- a/app/test/test_timer_perf.c +++ b/app/test/test_timer_perf.c @@ -27,7 +27,7 @@ timer_cb(struct rte_timer *t __rte_unused, void *param __rte_unused) #define DELAY_SECONDS 1 -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #define do_delay() usleep(10) #else #define do_delay() rte_pause() diff --git a/app/test/test_timer_racecond.c b/app/test/test_timer_racecond.c index d29048eaf1..1edb44444f 100644 --- a/app/test/test_timer_racecond.c +++ b/app/test/test_timer_racecond.c @@ -46,7 +46,7 @@ #undef TEST_TIMER_RACECOND_VERBOSE -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #define usec_delay(us) usleep(us) #else #define usec_delay(us) rte_delay_us(us) diff --git a/config/common_linuxapp b/config/common_linuxapp index 6c1c8d0f47..75334273d4 100644 --- a/config/common_linuxapp +++ b/config/common_linuxapp @@ -4,6 +4,7 @@ #include "common_base" CONFIG_RTE_EXEC_ENV="linuxapp" +CONFIG_RTE_EXEC_ENV_LINUX=y CONFIG_RTE_EXEC_ENV_LINUXAPP=y CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES=y diff --git a/config/rte_config.h b/config/rte_config.h index 7606f5d7b9..9b2e813f01 100644 --- a/config/rte_config.h +++ b/config/rte_config.h @@ -18,6 +18,11 @@ #include +/* legacy defines */ +#ifdef RTE_EXEC_ENV_LINUX +#define RTE_EXEC_ENV_LINUXAPP 1 +#endif + /****** library defines ********/ /* compat defines */ diff --git a/doc/guides/contributing/design.rst b/doc/guides/contributing/design.rst index 651fd224f5..8779c4bc02 100644 --- a/doc/guides/contributing/design.rst +++ b/doc/guides/contributing/design.rst @@ -55,7 +55,7 @@ Per Execution Environment Sources The following config options can be used: * ``CONFIG_RTE_EXEC_ENV`` is a string that contains the name of the executive environment. -* ``CONFIG_RTE_EXEC_ENV_BSDAPP`` or ``CONFIG_RTE_EXEC_ENV_LINUXAPP`` are defined only if we are building for this execution environment. +* ``CONFIG_RTE_EXEC_ENV_BSDAPP`` or ``CONFIG_RTE_EXEC_ENV_LINUX`` are defined only if we are building for this execution environment. Library Statistics ------------------ diff --git a/drivers/bus/pci/Makefile b/drivers/bus/pci/Makefile index f33e0120f6..88154b4de0 100644 --- a/drivers/bus/pci/Makefile +++ b/drivers/bus/pci/Makefile @@ -11,7 +11,7 @@ CFLAGS := -I$(SRCDIR) $(CFLAGS) CFLAGS += -O3 $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) SYSTEM := linux endif ifneq ($(CONFIG_RTE_EXEC_ENV_BSDAPP),) diff --git a/drivers/bus/vmbus/Makefile b/drivers/bus/vmbus/Makefile index e54c557c68..3a344fc9ce 100644 --- a/drivers/bus/vmbus/Makefile +++ b/drivers/bus/vmbus/Makefile @@ -10,7 +10,7 @@ CFLAGS += -I$(SRCDIR) CFLAGS += -O3 $(WERROR_FLAGS) CFLAGS += -DALLOW_EXPERIMENTAL_API -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),) SYSTEM := linux endif ifneq ($(CONFIG_RTE_EXEC_ENV_BSDAPP),) diff --git a/drivers/crypto/virtio/virtio_pci.c b/drivers/crypto/virtio/virtio_pci.c index 832c465bcf..0c0c644714 100644 --- a/drivers/crypto/virtio/virtio_pci.c +++ b/drivers/crypto/virtio/virtio_pci.c @@ -4,7 +4,7 @@ #include -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include #include #endif diff --git a/drivers/net/ark/Makefile b/drivers/net/ark/Makefile index 2e232be859..34d341c235 100644 --- a/drivers/net/ark/Makefile +++ b/drivers/net/ark/Makefile @@ -31,7 +31,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_ARK_PMD) += ark_udm.c # this lib depends upon: LDLIBS += -lpthread -ifdef CONFIG_RTE_EXEC_ENV_LINUXAPP +ifdef CONFIG_RTE_EXEC_ENV_LINUX LDLIBS += -ldl endif LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool -lrte_ring diff --git a/drivers/net/failsafe/Makefile b/drivers/net/failsafe/Makefile index 81802d0922..0d840a2721 100644 --- a/drivers/net/failsafe/Makefile +++ b/drivers/net/failsafe/Makefile @@ -20,7 +20,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_rxtx.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_ether.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_flow.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_FAILSAFE) += failsafe_intr.c -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) CFLAGS += -DLINUX else CFLAGS += -DBSD diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index 65bbd7e2f4..518d9e34a7 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -979,7 +979,7 @@ static int eth_pcap_update_mac(const char *if_name, struct rte_eth_dev *eth_dev, const unsigned int numa_node) { -#if defined(RTE_EXEC_ENV_LINUXAPP) +#if defined(RTE_EXEC_ENV_LINUX) void *mac_addrs; struct ifreq ifr; int if_fd = socket(AF_INET, SOCK_DGRAM, 0); diff --git a/drivers/net/sfc/sfc_intr.c b/drivers/net/sfc/sfc_intr.c index fbdc7eea1c..0fbcd61afa 100644 --- a/drivers/net/sfc/sfc_intr.c +++ b/drivers/net/sfc/sfc_intr.c @@ -292,7 +292,7 @@ sfc_intr_attach(struct sfc_adapter *sa) sfc_log_init(sa, "entry"); switch (pci_dev->intr_handle.type) { -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX case RTE_INTR_HANDLE_UIO_INTX: case RTE_INTR_HANDLE_VFIO_LEGACY: intr->type = EFX_INTR_LINE; diff --git a/drivers/net/softnic/rte_eth_softnic_tap.c b/drivers/net/softnic/rte_eth_softnic_tap.c index bcc23a9f0b..0cac876ed6 100644 --- a/drivers/net/softnic/rte_eth_softnic_tap.c +++ b/drivers/net/softnic/rte_eth_softnic_tap.c @@ -3,7 +3,7 @@ */ #include -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include #include #endif @@ -60,7 +60,7 @@ softnic_tap_find(struct pmd_internals *p, return NULL; } -#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_LINUX struct softnic_tap * softnic_tap_create(struct pmd_internals *p __rte_unused, diff --git a/drivers/net/virtio/virtio_pci.c b/drivers/net/virtio/virtio_pci.c index c8883c32e9..adc02f96af 100644 --- a/drivers/net/virtio/virtio_pci.c +++ b/drivers/net/virtio/virtio_pci.c @@ -3,7 +3,7 @@ */ #include -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include #include #endif diff --git a/examples/ethtool/Makefile b/examples/ethtool/Makefile index 3d9d4f06eb..70a4f5dc9a 100644 --- a/examples/ethtool/Makefile +++ b/examples/ethtool/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) else diff --git a/examples/ethtool/lib/Makefile b/examples/ethtool/lib/Makefile index 6eaa640bc6..ee83b8769b 100644 --- a/examples/ethtool/lib/Makefile +++ b/examples/ethtool/lib/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/exception_path/main.c b/examples/exception_path/main.c index 4180a8689b..8f37f5fbf3 100644 --- a/examples/exception_path/main.c +++ b/examples/exception_path/main.c @@ -14,7 +14,7 @@ #include #include -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include #endif #include @@ -156,7 +156,7 @@ signal_handler(int signum) } } -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX /* * Create a tap network interface, or use existing one with same name. * If name[0]='\0' then a name is automatically assigned and returned in name. diff --git a/examples/ip_pipeline/Makefile b/examples/ip_pipeline/Makefile index 41ba7df2ce..8b1744d0d0 100644 --- a/examples/ip_pipeline/Makefile +++ b/examples/ip_pipeline/Makefile @@ -68,7 +68,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all: diff --git a/examples/ip_pipeline/tap.c b/examples/ip_pipeline/tap.c index 11e4ad20e2..ea979bdf8f 100644 --- a/examples/ip_pipeline/tap.c +++ b/examples/ip_pipeline/tap.c @@ -3,7 +3,7 @@ */ #include -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX #include #include #endif @@ -46,7 +46,7 @@ tap_find(const char *name) return NULL; } -#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_LINUX struct tap * tap_create(const char *name __rte_unused) diff --git a/examples/kni/Makefile b/examples/kni/Makefile index dd90d7d734..096ec4d975 100644 --- a/examples/kni/Makefile +++ b/examples/kni/Makefile @@ -49,7 +49,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/l3fwd-power/Makefile b/examples/l3fwd-power/Makefile index 772ec7ba5f..61f151c125 100644 --- a/examples/l3fwd-power/Makefile +++ b/examples/l3fwd-power/Makefile @@ -50,7 +50,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all: diff --git a/examples/multi_process/Makefile b/examples/multi_process/Makefile index b76b02fcbb..4514014a08 100644 --- a/examples/multi_process/Makefile +++ b/examples/multi_process/Makefile @@ -10,9 +10,9 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += client_server_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += simple_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += symmetric_mp -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += hotplug_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += client_server_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += simple_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += symmetric_mp +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/multi_process/client_server_mp/Makefile b/examples/multi_process/client_server_mp/Makefile index 6f6c45228d..76f895175e 100644 --- a/examples/multi_process/client_server_mp/Makefile +++ b/examples/multi_process/client_server_mp/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += mp_client -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += mp_server +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_client +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += mp_server include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/multi_process/client_server_mp/mp_server/Makefile b/examples/multi_process/client_server_mp/mp_server/Makefile index 9c1caae79a..09ee270c01 100644 --- a/examples/multi_process/client_server_mp/mp_server/Makefile +++ b/examples/multi_process/client_server_mp/mp_server/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/netmap_compat/bridge/Makefile b/examples/netmap_compat/bridge/Makefile index 856c847bd8..4c8981acbe 100644 --- a/examples/netmap_compat/bridge/Makefile +++ b/examples/netmap_compat/bridge/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all: diff --git a/examples/performance-thread/pthread_shim/pthread_shim.c b/examples/performance-thread/pthread_shim/pthread_shim.c index a02de06777..93e8dca3fa 100644 --- a/examples/performance-thread/pthread_shim/pthread_shim.c +++ b/examples/performance-thread/pthread_shim/pthread_shim.c @@ -558,7 +558,7 @@ int pthread_rwlock_wrlock(pthread_rwlock_t *a) return _sys_pthread_funcs.f_pthread_rwlock_wrlock(a); } -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX int pthread_yield(void) { diff --git a/examples/qos_sched/Makefile b/examples/qos_sched/Makefile index 45b0a9eb6b..e0d298345b 100644 --- a/examples/qos_sched/Makefile +++ b/examples/qos_sched/Makefile @@ -48,7 +48,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all: diff --git a/examples/quota_watermark/Makefile b/examples/quota_watermark/Makefile index a37b8662f1..ec7d989ae3 100644 --- a/examples/quota_watermark/Makefile +++ b/examples/quota_watermark/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += qw -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += qwctl +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qw +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += qwctl include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/server_node_efd/Makefile b/examples/server_node_efd/Makefile index d23aba350b..de90253fe1 100644 --- a/examples/server_node_efd/Makefile +++ b/examples/server_node_efd/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += server -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += node +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += server +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += node include $(RTE_SDK)/mk/rte.extsubdir.mk diff --git a/examples/server_node_efd/server/Makefile b/examples/server_node_efd/server/Makefile index df6614c604..1ca958abbb 100644 --- a/examples/server_node_efd/server/Makefile +++ b/examples/server_node_efd/server/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/tep_termination/Makefile b/examples/tep_termination/Makefile index 4c15643259..44af6ca525 100644 --- a/examples/tep_termination/Makefile +++ b/examples/tep_termination/Makefile @@ -52,7 +52,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(error This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) endif diff --git a/examples/vhost/Makefile b/examples/vhost/Makefile index c6964381bd..540ccaaee6 100644 --- a/examples/vhost/Makefile +++ b/examples/vhost/Makefile @@ -52,7 +52,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all: diff --git a/examples/vhost_crypto/Makefile b/examples/vhost_crypto/Makefile index a620abf49e..719cc5595a 100644 --- a/examples/vhost_crypto/Makefile +++ b/examples/vhost_crypto/Makefile @@ -10,7 +10,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all: diff --git a/examples/vhost_scsi/Makefile b/examples/vhost_scsi/Makefile index 523aee0bf2..3392d24b2c 100644 --- a/examples/vhost_scsi/Makefile +++ b/examples/vhost_scsi/Makefile @@ -51,7 +51,7 @@ RTE_TARGET ?= x86_64-native-linuxapp-gcc include $(RTE_SDK)/mk/rte.vars.mk -ifneq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifneq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) $(info This application can only operate in a linuxapp environment, \ please change the definition of the RTE_TARGET environment variable) all: diff --git a/kernel/Makefile b/kernel/Makefile index 8948d04257..6716b566c1 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -3,7 +3,7 @@ include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linux +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd include $(RTE_SDK)/mk/rte.subdir.mk diff --git a/lib/Makefile b/lib/Makefile index ffbfd0d945..a358f1c197 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -110,7 +110,7 @@ DEPDIRS-librte_ipsec := librte_eal librte_mbuf librte_cryptodev librte_security DIRS-$(CONFIG_RTE_LIBRTE_TELEMETRY) += librte_telemetry DEPDIRS-librte_telemetry := librte_eal librte_metrics librte_ethdev -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) DIRS-$(CONFIG_RTE_LIBRTE_KNI) += librte_kni endif DEPDIRS-librte_kni := librte_eal librte_mempool librte_mbuf librte_ethdev diff --git a/lib/librte_eal/Makefile b/lib/librte_eal/Makefile index c6bd39f023..8b773da70d 100644 --- a/lib/librte_eal/Makefile +++ b/lib/librte_eal/Makefile @@ -4,7 +4,7 @@ include $(RTE_SDK)/mk/rte.vars.mk DIRS-y += common -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += linux +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += linux DEPDIRS-linux := common DIRS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += freebsd DEPDIRS-freebsd := common diff --git a/lib/librte_eal/common/arch/x86/rte_cycles.c b/lib/librte_eal/common/arch/x86/rte_cycles.c index 23c67d24c8..edd9621abb 100644 --- a/lib/librte_eal/common/arch/x86/rte_cycles.c +++ b/lib/librte_eal/common/arch/x86/rte_cycles.c @@ -29,7 +29,7 @@ rte_cpu_get_model(uint32_t fam_mod_step) static int32_t rdmsr(int msr, uint64_t *val) { -#ifdef RTE_EXEC_ENV_LINUXAPP +#ifdef RTE_EXEC_ENV_LINUX int fd; int ret; diff --git a/lib/librte_eal/linux/Makefile b/lib/librte_eal/linux/Makefile index a0fffa98e8..4c68bd61b8 100644 --- a/lib/librte_eal/linux/Makefile +++ b/lib/librte_eal/linux/Makefile @@ -3,7 +3,7 @@ include $(RTE_SDK)/mk/rte.vars.mk -DIRS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal +DIRS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal DEPDIRS-kni := eal CFLAGS += -DALLOW_EXPERIMENTAL_API diff --git a/lib/librte_eal/linux/eal/Makefile b/lib/librte_eal/linux/eal/Makefile index 51deb57974..9e32f1174e 100644 --- a/lib/librte_eal/linux/eal/Makefile +++ b/lib/librte_eal/linux/eal/Makefile @@ -30,58 +30,58 @@ LDLIBS += -lnuma endif # specific to linuxapp exec-env -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) := eal.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_hugepage_info.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_vfio.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_vfio_mp_sync.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_debug.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_interrupts.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_alarm.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_dev.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) := eal.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_cpuflags.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_hugepage_info.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memory.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_thread.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_log.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_vfio_mp_sync.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_memalloc.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_debug.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_lcore.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_timer.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_interrupts.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_alarm.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_dev.c # from common dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_lcore.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_timer.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_memzone.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_log.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_launch.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_memalloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_memory.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_tailqs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_errno.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_hypervisor.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_string_fns.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_hexdump.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_devargs.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_class.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_bus.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_dev.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_options.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_thread.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_proc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_fbarray.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += eal_common_uuid.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_malloc.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += hotplug_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += malloc_elem.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += malloc_heap.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += malloc_mp.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_keepalive.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_option.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_service.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_reciprocal.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_lcore.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_timer.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memzone.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_log.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_launch.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memalloc.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_memory.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_tailqs.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_errno.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_cpuflags.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hypervisor.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_string_fns.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_hexdump.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_devargs.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_class.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_bus.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_dev.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_options.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_thread.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_proc.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_fbarray.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += eal_common_uuid.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_malloc.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += hotplug_mp.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_elem.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_heap.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += malloc_mp.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_keepalive.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_option.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_service.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_reciprocal.c # from arch dir -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_cpuflags.c -SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_hypervisor.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_cpuflags.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUX) += rte_hypervisor.c SRCS-$(CONFIG_RTE_ARCH_X86) += rte_spinlock.c SRCS-y += rte_cycles.c @@ -95,7 +95,7 @@ endif INC := rte_kni_common.h -SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUXAPP)-include/exec-env := \ +SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include/exec-env := \ $(addprefix include/exec-env/,$(INC)) include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_eal/meson.build b/lib/librte_eal/meson.build index cb8d1094fc..61b1016af9 100644 --- a/lib/librte_eal/meson.build +++ b/lib/librte_eal/meson.build @@ -10,7 +10,7 @@ subdir('common') # defines common_sources, common_objs, etc. # Now do OS/exec-env specific settings, including building kernel modules # The /eal/meson.build file should define env_sources, etc. if host_machine.system() == 'linux' - dpdk_conf.set('RTE_EXEC_ENV_LINUXAPP', 1) + dpdk_conf.set('RTE_EXEC_ENV_LINUX', 1) subdir('linux/eal') elif host_machine.system() == 'freebsd' diff --git a/lib/librte_eventdev/Makefile b/lib/librte_eventdev/Makefile index 949618700a..53079f4c27 100644 --- a/lib/librte_eventdev/Makefile +++ b/lib/librte_eventdev/Makefile @@ -14,7 +14,7 @@ LIBABIVER := 6 CFLAGS += -DALLOW_EXPERIMENTAL_API CFLAGS += -O3 CFLAGS += $(WERROR_FLAGS) -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) CFLAGS += -DLINUX else CFLAGS += -DBSD diff --git a/lib/librte_kni/rte_kni.c b/lib/librte_kni/rte_kni.c index 73aeccccfd..492e207a31 100644 --- a/lib/librte_kni/rte_kni.c +++ b/lib/librte_kni/rte_kni.c @@ -2,7 +2,7 @@ * Copyright(c) 2010-2014 Intel Corporation */ -#ifndef RTE_EXEC_ENV_LINUXAPP +#ifndef RTE_EXEC_ENV_LINUX #error "KNI is not supported" #endif diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 3c40f9df22..262132fc64 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -97,7 +97,7 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_CMDLINE) += -lrte_cmdline _LDLIBS-$(CONFIG_RTE_LIBRTE_REORDER) += -lrte_reorder _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lrte_sched -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP),y) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX),y) _LDLIBS-$(CONFIG_RTE_LIBRTE_KNI) += -lrte_kni endif @@ -306,7 +306,7 @@ ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) # The static libraries do not know their dependencies. # So linking with static library requires explicit dependencies. _LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lrt -ifeq ($(CONFIG_RTE_EXEC_ENV_LINUXAPP)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy) +ifeq ($(CONFIG_RTE_EXEC_ENV_LINUX)$(CONFIG_RTE_EAL_NUMA_AWARE_HUGEPAGES),yy) _LDLIBS-$(CONFIG_RTE_LIBRTE_EAL) += -lnuma endif _LDLIBS-$(CONFIG_RTE_LIBRTE_SCHED) += -lm