From 428eb983f5f7614661dd5672e3a4ac51b23d6ee1 Mon Sep 17 00:00:00 2001 From: Anand Rawat Date: Mon, 1 Apr 2019 20:54:51 -0700 Subject: [PATCH] eal: add OS specific header file Added rte_os.h files to support OS specific functionality. Updated build system to contain OS headers in the include path. Signed-off-by: Anand Rawat Reviewed-by: Pallavi Kadam Acked-by: Harini Ramakrishnan Acked-by: Thomas Monjalon --- lib/librte_eal/freebsd/eal/Makefile | 4 ++-- lib/librte_eal/freebsd/eal/include/rte_os.h | 14 ++++++++++++++ lib/librte_eal/freebsd/eal/meson.build | 4 +++- lib/librte_eal/linux/eal/Makefile | 3 ++- lib/librte_eal/linux/eal/include/rte_os.h | 14 ++++++++++++++ lib/librte_eal/linux/eal/meson.build | 5 ++++- lib/librte_eal/windows/eal/include/rte_os.h | 14 ++++++++++++++ lib/librte_eal/windows/eal/meson.build | 4 +++- meson.build | 7 +++++-- mk/exec-env/freebsd/rte.vars.mk | 5 ++++- mk/exec-env/linux/rte.vars.mk | 5 ++++- 11 files changed, 69 insertions(+), 10 deletions(-) create mode 100644 lib/librte_eal/freebsd/eal/include/rte_os.h create mode 100644 lib/librte_eal/linux/eal/include/rte_os.h create mode 100644 lib/librte_eal/windows/eal/include/rte_os.h diff --git a/lib/librte_eal/freebsd/eal/Makefile b/lib/librte_eal/freebsd/eal/Makefile index 55d476e5b2..19854ee2c5 100644 --- a/lib/librte_eal/freebsd/eal/Makefile +++ b/lib/librte_eal/freebsd/eal/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2015 Intel Corporation +# Copyright(c) 2010-2019 Intel Corporation include $(RTE_SDK)/mk/rte.vars.mk @@ -86,7 +86,7 @@ CFLAGS_eal_thread.o += -Wno-return-type CFLAGS_eal_hpet.o += -Wno-return-type endif -INC := # no bsd specific headers +INC := rte_os.h SYMLINK-$(CONFIG_RTE_EXEC_ENV_FREEBSD)-include := $(addprefix include/,$(INC)) diff --git a/lib/librte_eal/freebsd/eal/include/rte_os.h b/lib/librte_eal/freebsd/eal/include/rte_os.h new file mode 100644 index 0000000000..49cd4d4d98 --- /dev/null +++ b/lib/librte_eal/freebsd/eal/include/rte_os.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2019 Intel Corporation + */ + +#ifndef _RTE_OS_H_ +#define _RTE_OS_H_ + +/** + * This is header should contain any function/macro definition + * which are not supported natively or named differently in the + * freebsd OS. Functions will be added in future releases. + */ + +#endif /* _RTE_OS_H_ */ diff --git a/lib/librte_eal/freebsd/eal/meson.build b/lib/librte_eal/freebsd/eal/meson.build index 3945b52923..1426f7e5f1 100644 --- a/lib/librte_eal/freebsd/eal/meson.build +++ b/lib/librte_eal/freebsd/eal/meson.build @@ -2,7 +2,9 @@ # Copyright(c) 2017 Intel Corporation env_objs = [] -env_headers = [] +env_headers = files( + 'include/rte_os.h', +) env_sources = files('eal_alarm.c', 'eal_cpuflags.c', 'eal_debug.c', diff --git a/lib/librte_eal/linux/eal/Makefile b/lib/librte_eal/linux/eal/Makefile index 2aa6e8c6a5..6e52611522 100644 --- a/lib/librte_eal/linux/eal/Makefile +++ b/lib/librte_eal/linux/eal/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2016 Intel Corporation +# Copyright(c) 2010-2019 Intel Corporation include $(RTE_SDK)/mk/rte.vars.mk @@ -94,6 +94,7 @@ CFLAGS_eal_thread.o += -Wno-return-type endif INC := rte_kni_common.h +INC += rte_os.h SYMLINK-$(CONFIG_RTE_EXEC_ENV_LINUX)-include := $(addprefix include/,$(INC)) diff --git a/lib/librte_eal/linux/eal/include/rte_os.h b/lib/librte_eal/linux/eal/include/rte_os.h new file mode 100644 index 0000000000..bc6ad14d25 --- /dev/null +++ b/lib/librte_eal/linux/eal/include/rte_os.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2019 Intel Corporation + */ + +#ifndef _RTE_OS_H_ +#define _RTE_OS_H_ + +/** + * This is header should contain any function/macro definition + * which are not supported natively or named differently in the + * linux OS. Functions will be added in future releases. + */ + +#endif /* _RTE_OS_H_ */ diff --git a/lib/librte_eal/linux/eal/meson.build b/lib/librte_eal/linux/eal/meson.build index d223da638e..b02b0695f5 100644 --- a/lib/librte_eal/linux/eal/meson.build +++ b/lib/librte_eal/linux/eal/meson.build @@ -4,7 +4,10 @@ eal_inc += include_directories('include') env_objs = [] -env_headers = files('include/rte_kni_common.h') +env_headers = files( + 'include/rte_kni_common.h', + 'include/rte_os.h', +) env_sources = files('eal_alarm.c', 'eal_cpuflags.c', 'eal_debug.c', diff --git a/lib/librte_eal/windows/eal/include/rte_os.h b/lib/librte_eal/windows/eal/include/rte_os.h new file mode 100644 index 0000000000..421ed8e7f4 --- /dev/null +++ b/lib/librte_eal/windows/eal/include/rte_os.h @@ -0,0 +1,14 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2010-2019 Intel Corporation + */ + +#ifndef _RTE_OS_H_ +#define _RTE_OS_H_ + +/** + * This is header should contain any function/macro definition + * which are not supported natively or named differently in the + * Windows OS. Functions will be added in future releases. + */ + +#endif /* _RTE_OS_H_ */ diff --git a/lib/librte_eal/windows/eal/meson.build b/lib/librte_eal/windows/eal/meson.build index 8b17356231..1781e60d65 100644 --- a/lib/librte_eal/windows/eal/meson.build +++ b/lib/librte_eal/windows/eal/meson.build @@ -2,7 +2,9 @@ # Copyright(c) 2019 Intel Corporation env_objs = [] -env_headers = [] +env_headers = files( + 'include/rte_os.h', +) env_sources = files('eal.c', 'eal_debug.c', 'eal_lcore.c', diff --git a/meson.build b/meson.build index 6061c4b1e7..a964865977 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2017 Intel Corporation +# Copyright(c) 2017-2019 Intel Corporation project('DPDK', 'C', # Get version number from file. @@ -24,7 +24,10 @@ dpdk_app_link_libraries = [] # configure the build, and make sure configs here and in config folder are # able to be included in any file. We also store a global array of include dirs # for passing to pmdinfogen scripts -global_inc = include_directories('.', 'config', 'lib/librte_eal/common/include') +global_inc = include_directories('.', 'config', + 'lib/librte_eal/common/include', + 'lib/librte_eal/@0@/eal/include'.format(host_machine.system()), +) subdir('config') # build libs and drivers diff --git a/mk/exec-env/freebsd/rte.vars.mk b/mk/exec-env/freebsd/rte.vars.mk index c6be560b3d..3608530d3f 100644 --- a/mk/exec-env/freebsd/rte.vars.mk +++ b/mk/exec-env/freebsd/rte.vars.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2010-2019 Intel Corporation # # exec-env: @@ -17,6 +17,9 @@ else EXECENV_CFLAGS = -pthread endif +# include in every library to build +EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/freebsd/eal/include + EXECENV_LDFLAGS = EXECENV_LDLIBS = -lexecinfo EXECENV_ASFLAGS = diff --git a/mk/exec-env/linux/rte.vars.mk b/mk/exec-env/linux/rte.vars.mk index d04d0e29c6..bea3f76577 100644 --- a/mk/exec-env/linux/rte.vars.mk +++ b/mk/exec-env/linux/rte.vars.mk @@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2010-2014 Intel Corporation +# Copyright(c) 2010-2019 Intel Corporation # # exec-env: @@ -17,6 +17,9 @@ else EXECENV_CFLAGS = -pthread endif +# include in every library to build +EXECENV_CFLAGS += -I$(RTE_SDK)/lib/librte_eal/linux/eal/include + EXECENV_LDLIBS = EXECENV_ASFLAGS = -- 2.20.1