d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

build/linux: rename macro from LINUXAPP to LINUX

Browse Source 
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 <bruce.richardson@intel.com>
This commit is contained in:
Bruce Richardson 2019-03-06 16:22:39 +00:00 committed by Thomas Monjalon
parent 91d7846ce6
commit 742bde12f3
50 changed files with 115 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/test/process.h
View File

@ -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)
{

2
app/test/test_eal_flags.c
View File

@ -190,7 +190,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action)
return result;
}
#ifdef RTE_EXEC_ENV_LINUXAPP
#ifdef RTE_EXEC_ENV_LINUX
/*
* count the number of "node*" files in /sys/devices/system/node/
*/

4
app/test/test_interrupts.c
View File

@ -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.

2
app/test/test_kni.c
View File

@ -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)

6
app/test/test_mp_secondary.c
View File

@ -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

2
app/test/test_pdump.c
View File

@ -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 };

2
app/test/test_timer_perf.c
View File

@ -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()

2
app/test/test_timer_racecond.c
View File

@ -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)

1
config/common_linuxapp
View File

@ -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

5
config/rte_config.h
View File

@ -18,6 +18,11 @@
#include <rte_build_config.h>
/* legacy defines */
#ifdef RTE_EXEC_ENV_LINUX
#define RTE_EXEC_ENV_LINUXAPP 1
#endif
/****** library defines ********/
/* compat defines */

2
doc/guides/contributing/design.rst
View File

@ -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
------------------

2
drivers/bus/pci/Makefile
View File

@ -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),)

2
drivers/bus/vmbus/Makefile
View File

@ -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),)

2
drivers/crypto/virtio/virtio_pci.c
View File

@ -4,7 +4,7 @@
#include <stdint.h>
#ifdef RTE_EXEC_ENV_LINUXAPP
#ifdef RTE_EXEC_ENV_LINUX
#include <dirent.h>
#include <fcntl.h>
#endif

2
drivers/net/ark/Makefile
View File

@ -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

2
drivers/net/failsafe/Makefile
View File

@ -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

2
drivers/net/pcap/rte_eth_pcap.c
View File

@ -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);

2
drivers/net/sfc/sfc_intr.c
View File

@ -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;

4
drivers/net/softnic/rte_eth_softnic_tap.c
View File

@ -3,7 +3,7 @@
*/
#include <netinet/in.h>
#ifdef RTE_EXEC_ENV_LINUXAPP
#ifdef RTE_EXEC_ENV_LINUX
#include <linux/if.h>
#include <linux/if_tun.h>
#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,

2
drivers/net/virtio/virtio_pci.c
View File

@ -3,7 +3,7 @@
*/
#include <stdint.h>
#ifdef RTE_EXEC_ENV_LINUXAPP
#ifdef RTE_EXEC_ENV_LINUX
#include <dirent.h>
#include <fcntl.h>
#endif

2
examples/ethtool/Makefile
View File

@ -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

2
examples/ethtool/lib/Makefile
View File

@ -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

4
examples/exception_path/main.c
View File

@ -14,7 +14,7 @@
#include <netinet/in.h>
#include <net/if.h>
#ifdef RTE_EXEC_ENV_LINUXAPP
#ifdef RTE_EXEC_ENV_LINUX
#include <linux/if_tun.h>
#endif
#include <fcntl.h>
@ -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.

2
examples/ip_pipeline/Makefile
View File

@ -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:

4
examples/ip_pipeline/tap.c
View File

@ -3,7 +3,7 @@
*/
#include <netinet/in.h>
#ifdef RTE_EXEC_ENV_LINUXAPP
#ifdef RTE_EXEC_ENV_LINUX
#include <linux/if.h>
#include <linux/if_tun.h>
#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)

2
examples/kni/Makefile
View File

@ -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

2
examples/l3fwd-power/Makefile
View File

@ -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:

8
examples/multi_process/Makefile
View File

@ -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

4
examples/multi_process/client_server_mp/Makefile
View File

@ -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

2
examples/multi_process/client_server_mp/mp_server/Makefile
View File

@ -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

2
examples/netmap_compat/bridge/Makefile
View File

@ -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:

2
examples/performance-thread/pthread_shim/pthread_shim.c
View File

@ -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)
{

2
examples/qos_sched/Makefile
View File

@ -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:

4
examples/quota_watermark/Makefile
View File

@ -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

4
examples/server_node_efd/Makefile
View File

@ -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

2
examples/server_node_efd/server/Makefile
View File

@ -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

2
examples/tep_termination/Makefile
View File

@ -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

2
examples/vhost/Makefile
View File

@ -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:

2
examples/vhost_crypto/Makefile
View File

@ -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:

2
examples/vhost_scsi/Makefile
View File

@ -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:

2
kernel/Makefile
View File

@ -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

2
lib/Makefile
View File

@ -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

2
lib/librte_eal/Makefile
View File

@ -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

2
lib/librte_eal/common/arch/x86/rte_cycles.c
View File

@ -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;

2
lib/librte_eal/linux/Makefile
View File

@ -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

98
lib/librte_eal/linux/eal/Makefile
View File

@ -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

2
lib/librte_eal/meson.build
View File

@ -10,7 +10,7 @@ subdir('common') # defines common_sources, common_objs, etc.
# Now do OS/exec-env specific settings, including building kernel modules
# The <exec-env>/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'

2
lib/librte_eventdev/Makefile
View File

@ -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

2
lib/librte_kni/rte_kni.c
View File

@ -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

4
mk/rte.app.mk
View File

@ -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