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

eal: add OS specific header file

Browse Source 
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 <anand.rawat@intel.com>
Reviewed-by: Pallavi Kadam <pallavi.kadam@intel.com>
Acked-by: Harini Ramakrishnan <harini.ramakrishnan@microsoft.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
This commit is contained in:
Anand Rawat 2019-04-01 20:54:51 -07:00 committed by Thomas Monjalon
parent 98edcbb5ab
commit 428eb983f5
11 changed files with 69 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/librte_eal/freebsd/eal/Makefile
View File

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

14
lib/librte_eal/freebsd/eal/include/rte_os.h Normal file
View File

@ -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_ */

4
lib/librte_eal/freebsd/eal/meson.build
View File

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

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

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

14
lib/librte_eal/linux/eal/include/rte_os.h Normal file
View File

@ -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_ */

5
lib/librte_eal/linux/eal/meson.build
View File

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

14
lib/librte_eal/windows/eal/include/rte_os.h Normal file
View File

@ -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_ */

4
lib/librte_eal/windows/eal/meson.build
View File

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

7
meson.build
View File

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

5
mk/exec-env/freebsd/rte.vars.mk
View File

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

5
mk/exec-env/linux/rte.vars.mk
View File

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