Currently there are a couple of header files include 'sys/queue.h', which is a POSIX functionality. When compiling DPDK with OVS on Windows, we encountered issues such as, found the missing header. In file included from ../lib/dpdk.c:27: C:\temp\dpdk\include\rte_log.h:24:10: fatal error: 'sys/queue.h' file not found
The patch fixes it by 1) removing the #include <sys/queue.h> from a couple of headers, replace it with #include <rte_os.h>, and 2) include sys/queue.h in the rte_os.h. As a result, for Linux/BSD, it is using the sys/queue.h from its POSIX library, and for Windows, DPDK will use the bundled sys/queue.h. 1) fixes the case that DPDK library shouldn't export POSIX functionality into the environment (symbols, macros, headers etc), which cause definitions clashing with the application. 2) fixes the case that DPDK should depend only on the C library and not require POSIX functionality from the underlying system. There are still a couple of headers using sys/queue.h, ex: rte_bus_pci.h. Since it's not been used in Windows yet, we can fix them later. Suggested-by: Nick Connolly <nick.conno...@mayadata.io> Suggested-by: Dmitry Kozliuk <dmitry.kozl...@gmail.com> Signed-off-by: William Tu <u9012...@gmail.com> --- v1->v2: - follow the suggestion by Nick and Dmitry - http://mails.dpdk.org/archives/dev/2021-August/216304.html --- lib/eal/freebsd/include/rte_os.h | 1 + lib/eal/include/rte_bus.h | 2 +- lib/eal/include/rte_class.h | 2 -- lib/eal/include/rte_dev.h | 2 +- lib/eal/include/rte_devargs.h | 1 - lib/eal/include/rte_log.h | 1 - lib/eal/include/rte_service.h | 1 - lib/eal/include/rte_tailq.h | 2 +- lib/eal/linux/include/rte_os.h | 1 + lib/eal/windows/include/meson.build | 4 ++++ lib/eal/windows/include/rte_os.h | 1 + lib/eal/windows/include/sys/meson.build | 6 ++++++ lib/mempool/rte_mempool.h | 1 - 13 files changed, 16 insertions(+), 9 deletions(-) create mode 100644 lib/eal/windows/include/sys/meson.build diff --git a/lib/eal/freebsd/include/rte_os.h b/lib/eal/freebsd/include/rte_os.h index 627f0483ab..c0fa9791a1 100644 --- a/lib/eal/freebsd/include/rte_os.h +++ b/lib/eal/freebsd/include/rte_os.h @@ -11,6 +11,7 @@ */ #include <pthread_np.h> +#include <sys/queue.h> typedef cpuset_t rte_cpuset_t; #define RTE_HAS_CPUSET diff --git a/lib/eal/include/rte_bus.h b/lib/eal/include/rte_bus.h index 80b154fb98..8e90d768bd 100644 --- a/lib/eal/include/rte_bus.h +++ b/lib/eal/include/rte_bus.h @@ -19,8 +19,8 @@ extern "C" { #endif #include <stdio.h> -#include <sys/queue.h> +#include <rte_os.h> #include <rte_log.h> #include <rte_dev.h> diff --git a/lib/eal/include/rte_class.h b/lib/eal/include/rte_class.h index 856d09b22d..1430c62943 100644 --- a/lib/eal/include/rte_class.h +++ b/lib/eal/include/rte_class.h @@ -22,8 +22,6 @@ extern "C" { #endif -#include <sys/queue.h> - #include <rte_dev.h> /** Double linked list of classes */ diff --git a/lib/eal/include/rte_dev.h b/lib/eal/include/rte_dev.h index 6dd72c11a1..7d1bf32a42 100644 --- a/lib/eal/include/rte_dev.h +++ b/lib/eal/include/rte_dev.h @@ -18,8 +18,8 @@ extern "C" { #endif #include <stdio.h> -#include <sys/queue.h> +#include <rte_os.h> #include <rte_config.h> #include <rte_compat.h> #include <rte_log.h> diff --git a/lib/eal/include/rte_devargs.h b/lib/eal/include/rte_devargs.h index cd90944fe8..9ec2786812 100644 --- a/lib/eal/include/rte_devargs.h +++ b/lib/eal/include/rte_devargs.h @@ -21,7 +21,6 @@ extern "C" { #endif #include <stdio.h> -#include <sys/queue.h> #include <rte_compat.h> #include <rte_bus.h> diff --git a/lib/eal/include/rte_log.h b/lib/eal/include/rte_log.h index b706bb8710..bb3523467b 100644 --- a/lib/eal/include/rte_log.h +++ b/lib/eal/include/rte_log.h @@ -21,7 +21,6 @@ extern "C" { #include <stdio.h> #include <stdarg.h> #include <stdbool.h> -#include <sys/queue.h> #include <rte_common.h> #include <rte_config.h> diff --git a/lib/eal/include/rte_service.h b/lib/eal/include/rte_service.h index c7d037d862..1c9275c32a 100644 --- a/lib/eal/include/rte_service.h +++ b/lib/eal/include/rte_service.h @@ -29,7 +29,6 @@ extern "C" { #include<stdio.h> #include <stdint.h> -#include <sys/queue.h> #include <rte_config.h> #include <rte_lcore.h> diff --git a/lib/eal/include/rte_tailq.h b/lib/eal/include/rte_tailq.h index b6fe4e5f78..b948ccd45c 100644 --- a/lib/eal/include/rte_tailq.h +++ b/lib/eal/include/rte_tailq.h @@ -15,8 +15,8 @@ extern "C" { #endif -#include <sys/queue.h> #include <stdio.h> +#include <rte_os.h> #include <rte_debug.h> /** dummy structure type used by the rte_tailq APIs */ diff --git a/lib/eal/linux/include/rte_os.h b/lib/eal/linux/include/rte_os.h index 1618b4df22..9077e9b614 100644 --- a/lib/eal/linux/include/rte_os.h +++ b/lib/eal/linux/include/rte_os.h @@ -11,6 +11,7 @@ */ #include <sched.h> +#include <sys/queue.h> #ifdef CPU_SETSIZE /* may require _GNU_SOURCE */ typedef cpu_set_t rte_cpuset_t; diff --git a/lib/eal/windows/include/meson.build b/lib/eal/windows/include/meson.build index b3534b025f..875cc1cf0d 100644 --- a/lib/eal/windows/include/meson.build +++ b/lib/eal/windows/include/meson.build @@ -8,3 +8,7 @@ headers += files( 'rte_virt2phys.h', 'rte_windows.h', ) + +sys_headers = [] +subdir('sys') +install_headers(sys_headers, subdir: 'sys') diff --git a/lib/eal/windows/include/rte_os.h b/lib/eal/windows/include/rte_os.h index 66c711d458..81457a1b8b 100644 --- a/lib/eal/windows/include/rte_os.h +++ b/lib/eal/windows/include/rte_os.h @@ -13,6 +13,7 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> +#include <sys/queue.h> #ifdef __cplusplus extern "C" { diff --git a/lib/eal/windows/include/sys/meson.build b/lib/eal/windows/include/sys/meson.build new file mode 100644 index 0000000000..6896cbf678 --- /dev/null +++ b/lib/eal/windows/include/sys/meson.build @@ -0,0 +1,6 @@ +# SPDX-License-Identifier: BSD-3-Clause +# Copyright 2021 VMware, Inc + +sys_headers += files( + 'queue.h', +) diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h index 4235d6f0bf..1cc013ac4e 100644 --- a/lib/mempool/rte_mempool.h +++ b/lib/mempool/rte_mempool.h @@ -38,7 +38,6 @@ #include <stdint.h> #include <errno.h> #include <inttypes.h> -#include <sys/queue.h> #include <rte_config.h> #include <rte_spinlock.h> -- 2.30.2
