diff options
-rw-r--r-- | platform/linux-dpdk/Makefile.am | 168 | ||||
-rw-r--r-- | platform/linux-dpdk/include/odp_buffer_internal.h | 18 | ||||
-rw-r--r-- | platform/linux-dpdk/include/odp_packet_dpdk.h | 14 | ||||
-rw-r--r-- | platform/linux-dpdk/include/odp_packet_internal.h | 10 | ||||
-rw-r--r-- | platform/linux-dpdk/include/odp_packet_io_internal.h | 2 | ||||
-rw-r--r-- | platform/linux-dpdk/include/odp_pool_internal.h | 12 | ||||
-rw-r--r-- | platform/linux-dpdk/odp_buffer.c | 4 | ||||
-rw-r--r-- | platform/linux-dpdk/odp_init.c | 6 | ||||
-rw-r--r-- | platform/linux-dpdk/odp_linux.c | 8 | ||||
-rw-r--r-- | platform/linux-dpdk/odp_packet.c | 10 | ||||
-rw-r--r-- | platform/linux-dpdk/odp_packet_dpdk.c | 6 | ||||
-rw-r--r-- | platform/linux-dpdk/odp_packet_io.c | 10 | ||||
-rw-r--r-- | platform/linux-dpdk/odp_pool.c | 16 | ||||
-rw-r--r-- | platform/linux-dpdk/odp_queue.c | 22 |
14 files changed, 188 insertions, 118 deletions
diff --git a/platform/linux-dpdk/Makefile.am b/platform/linux-dpdk/Makefile.am index 2a0887b89..38b978922 100644 --- a/platform/linux-dpdk/Makefile.am +++ b/platform/linux-dpdk/Makefile.am @@ -12,69 +12,138 @@ AM_LDFLAGS += -L$(SDK_INSTALL_PATH)/lib endif AM_CFLAGS += $(PLAT_CFLAGS) -#prevent the linux-generic internal header to be included -AM_CFLAGS += -D ODP_BUFFER_INLINES_H_ AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(srcdir)/include/api AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include -AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include/api +AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/helper/include DPDK_LIBS="-lintel_dpdk -ldl -lm" LIBS += $(DPDK_LIBS) include_HEADERS = \ - $(top_srcdir)/platform/linux-generic/include/api/odp_buffer.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_align.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_atomic.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_barrier.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_buffer_pool.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_byteorder.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_classification.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_compiler.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_config.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_coremask.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_crypto.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_debug.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_hints.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_init.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_packet_flags.h \ - $(srcdir)/include/api/odp_packet.h \ - $(srcdir)/include/api/odp_packet_inlines.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_packet_io.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_queue.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_rwlock.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_schedule.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_shared_memory.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_spinlock.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_std_types.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_sync.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_system_info.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_thread.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_ticketlock.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_time.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_timer.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_version.h \ - $(srcdir)/include/api/odp_platform_types.h + $(top_srcdir)/include/odp.h -subdirheadersdir = $(includedir)/helper +odpincludedir= $(includedir)/odp +odpinclude_HEADERS = \ + $(top_srcdir)/platform/linux-generic/include/odp/align.h \ + $(top_srcdir)/platform/linux-generic/include/odp/atomic.h \ + $(top_srcdir)/platform/linux-generic/include/odp/barrier.h \ + $(top_srcdir)/platform/linux-generic/include/odp/buffer.h \ + $(top_srcdir)/platform/linux-generic/include/odp/byteorder.h \ + $(top_srcdir)/platform/linux-generic/include/odp/classification.h \ + $(top_srcdir)/platform/linux-generic/include/odp/compiler.h \ + $(top_srcdir)/platform/linux-generic/include/odp/config.h \ + $(top_srcdir)/platform/linux-generic/include/odp/cpu.h \ + $(top_srcdir)/platform/linux-generic/include/odp/cpumask.h \ + $(top_srcdir)/platform/linux-generic/include/odp/crypto.h \ + $(top_srcdir)/platform/linux-generic/include/odp/debug.h \ + $(top_srcdir)/platform/linux-generic/include/odp/errno.h \ + $(top_srcdir)/platform/linux-generic/include/odp/event.h \ + $(top_srcdir)/platform/linux-generic/include/odp/hints.h \ + $(top_srcdir)/platform/linux-generic/include/odp/init.h \ + $(top_srcdir)/platform/linux-generic/include/odp/packet_flags.h \ + $(srcdir)/include/odp/packet.h \ + $(top_srcdir)/platform/linux-generic/include/odp/packet_io.h \ + $(top_srcdir)/platform/linux-generic/include/odp/pool.h \ + $(top_srcdir)/platform/linux-generic/include/odp/queue.h \ + $(top_srcdir)/platform/linux-generic/include/odp/random.h \ + $(top_srcdir)/platform/linux-generic/include/odp/rwlock.h \ + $(top_srcdir)/platform/linux-generic/include/odp/schedule.h \ + $(top_srcdir)/platform/linux-generic/include/odp/shared_memory.h \ + $(top_srcdir)/platform/linux-generic/include/odp/spinlock.h \ + $(top_srcdir)/platform/linux-generic/include/odp/std_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/sync.h \ + $(top_srcdir)/platform/linux-generic/include/odp/system_info.h \ + $(top_srcdir)/platform/linux-generic/include/odp/thread.h \ + $(top_srcdir)/platform/linux-generic/include/odp/ticketlock.h \ + $(top_srcdir)/platform/linux-generic/include/odp/time.h \ + $(top_srcdir)/platform/linux-generic/include/odp/timer.h \ + $(top_srcdir)/platform/linux-generic/include/odp/version.h + +odpplatincludedir= $(includedir)/odp/plat +odpplatinclude_HEADERS = \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/atomic_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/buffer_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/byteorder_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/classification_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/cpumask_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/crypto_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/event_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/packet_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/packet_io_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/pool_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/queue_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/schedule_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/shared_memory_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/strong_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/timer_types.h \ + $(top_srcdir)/platform/linux-generic/include/odp/plat/version_types.h + +odpapiincludedir= $(includedir)/odp/api +odpapiinclude_HEADERS = \ + $(top_srcdir)/include/odp/api/align.h \ + $(top_srcdir)/include/odp/api/atomic.h \ + $(top_srcdir)/include/odp/api/barrier.h \ + $(top_srcdir)/include/odp/api/buffer.h \ + $(top_srcdir)/include/odp/api/byteorder.h \ + $(top_srcdir)/include/odp/api/classification.h \ + $(top_srcdir)/include/odp/api/compiler.h \ + $(top_srcdir)/include/odp/api/config.h \ + $(top_srcdir)/include/odp/api/cpu.h \ + $(top_srcdir)/include/odp/api/cpumask.h \ + $(top_srcdir)/include/odp/api/crypto.h \ + $(top_srcdir)/include/odp/api/debug.h \ + $(top_srcdir)/include/odp/api/errno.h \ + $(top_srcdir)/include/odp/api/event.h \ + $(top_srcdir)/include/odp/api/hints.h \ + $(top_srcdir)/include/odp/api/init.h \ + $(top_srcdir)/include/odp/api/packet.h \ + $(top_srcdir)/include/odp/api/packet_flags.h \ + $(top_srcdir)/include/odp/api/packet_io.h \ + $(top_srcdir)/include/odp/api/pool.h \ + $(top_srcdir)/include/odp/api/queue.h \ + $(top_srcdir)/include/odp/api/random.h \ + $(top_srcdir)/include/odp/api/rwlock.h \ + $(top_srcdir)/include/odp/api/schedule.h \ + $(top_srcdir)/include/odp/api/shared_memory.h \ + $(top_srcdir)/include/odp/api/spinlock.h \ + $(top_srcdir)/include/odp/api/std_types.h \ + $(top_srcdir)/include/odp/api/sync.h \ + $(top_srcdir)/include/odp/api/system_info.h \ + $(top_srcdir)/include/odp/api/thread.h \ + $(top_srcdir)/include/odp/api/ticketlock.h \ + $(top_srcdir)/include/odp/api/time.h \ + $(top_srcdir)/include/odp/api/timer.h \ + $(top_srcdir)/include/odp/api/version.h + +noinst_HEADERS = \ + $(srcdir)/include/odp_buffer_internal.h \ + $(srcdir)/include/odp_packet_dpdk.h \ + $(srcdir)/include/odp_packet_internal.h \ + $(srcdir)/include/odp_packet_io_internal.h \ + $(srcdir)/include/odp_packet_io_queue.h \ + $(srcdir)/include/odp_pool_internal.h \ + ${top_srcdir}/platform/linux-generic/Makefile.inc + +subdirheadersdir = $(includedir)/odp/helper subdirheaders_HEADERS = \ - $(top_srcdir)/helper/include/odph_chksum.h \ - $(top_srcdir)/helper/include/odph_eth.h \ - $(top_srcdir)/helper/include/odph_icmp.h \ - $(top_srcdir)/helper/include/odph_ip.h \ - $(top_srcdir)/helper/include/odph_ipsec.h \ - $(top_srcdir)/helper/include/odph_linux.h \ - $(top_srcdir)/helper/include/odph_ring.h \ - $(top_srcdir)/helper/include/odph_udp.h + $(top_srcdir)/helper/include/odp/helper/chksum.h \ + $(top_srcdir)/helper/include/odp/helper/eth.h \ + $(top_srcdir)/helper/include/odp/helper/icmp.h \ + $(top_srcdir)/helper/include/odp/helper/ip.h \ + $(top_srcdir)/helper/include/odp/helper/ipsec.h \ + $(top_srcdir)/helper/include/odp/helper/linux.h \ + $(top_srcdir)/helper/include/odp/helper/ring.h \ + $(top_srcdir)/helper/include/odp/helper/tcp.h \ + $(top_srcdir)/helper/include/odp/helper/udp.h __LIB__libodp_la_SOURCES = \ ../linux-generic/odp_barrier.c \ odp_buffer.c \ - odp_buffer_pool.c \ - ../linux-generic/odp_coremask.c \ + ../linux-generic/odp_cpumask.c \ ../linux-generic/odp_crypto.c \ + ../linux-generic/odp_errno.c \ + ../linux-generic/odp_event.c \ odp_init.c \ ../linux-generic/odp_impl.c \ odp_linux.c \ @@ -83,6 +152,7 @@ __LIB__libodp_la_SOURCES = \ ../linux-generic/odp_packet_flags.c \ odp_packet_io.c \ ../linux-generic/odp_packet_socket.c \ + odp_pool.c \ odp_queue.c \ ../linux-generic/odp_ring.c \ ../linux-generic/odp_rwlock.c \ @@ -94,5 +164,5 @@ __LIB__libodp_la_SOURCES = \ ../linux-generic/odp_ticketlock.c \ ../linux-generic/odp_time.c \ ../linux-generic/odp_timer.c \ + ../linux-generic/odp_version.c \ ../linux-generic/odp_weak.c - diff --git a/platform/linux-dpdk/include/odp_buffer_internal.h b/platform/linux-dpdk/include/odp_buffer_internal.h index b1dad50f4..13ed851a8 100644 --- a/platform/linux-dpdk/include/odp_buffer_internal.h +++ b/platform/linux-dpdk/include/odp_buffer_internal.h @@ -18,16 +18,16 @@ extern "C" { #endif -#include <odp_std_types.h> -#include <odp_atomic.h> -#include <odp_buffer_pool.h> -#include <odp_buffer.h> -#include <odp_debug.h> -#include <odp_align.h> +#include <odp/std_types.h> +#include <odp/atomic.h> +#include <odp/pool.h> +#include <odp/buffer.h> +#include <odp/debug.h> +#include <odp/align.h> #include <odp_align_internal.h> -#include <odp_config.h> -#include <odp_byteorder.h> -#include <odp_thread.h> +#include <odp/config.h> +#include <odp/byteorder.h> +#include <odp/thread.h> /* DPDK */ #include <rte_mbuf.h> diff --git a/platform/linux-dpdk/include/odp_packet_dpdk.h b/platform/linux-dpdk/include/odp_packet_dpdk.h index 27a44c535..2b6c4a623 100644 --- a/platform/linux-dpdk/include/odp_packet_dpdk.h +++ b/platform/linux-dpdk/include/odp_packet_dpdk.h @@ -10,15 +10,15 @@ #include <stdint.h> #include <net/if.h> -#include <odph_eth.h> -#include <odp_align.h> -#include <odp_debug.h> -#include <odp_packet.h> +#include <odp/helper/eth.h> +#include <odp/align.h> +#include <odp/debug.h> +#include <odp/packet.h> #include <odp_packet_internal.h> -#include <odp_buffer_pool.h> -#include <odp_buffer_pool_internal.h> +#include <odp/pool.h> +#include <odp_pool_internal.h> #include <odp_buffer_internal.h> -#include <odp_std_types.h> +#include <odp/std_types.h> #include <rte_config.h> #include <rte_memory.h> diff --git a/platform/linux-dpdk/include/odp_packet_internal.h b/platform/linux-dpdk/include/odp_packet_internal.h index 38afe6aa7..8a7b211f4 100644 --- a/platform/linux-dpdk/include/odp_packet_internal.h +++ b/platform/linux-dpdk/include/odp_packet_internal.h @@ -18,13 +18,13 @@ extern "C" { #endif -#include <odp_align.h> +#include <odp/align.h> #include <odp_debug_internal.h> -#include <odp_debug.h> +#include <odp/debug.h> #include <odp_buffer_internal.h> -#include <odp_buffer_pool_internal.h> -#include <odp_packet.h> -#include <odp_packet_io.h> +#include <odp_pool_internal.h> +#include <odp/packet.h> +#include <odp/packet_io.h> /** * Packet input & protocol flags diff --git a/platform/linux-dpdk/include/odp_packet_io_internal.h b/platform/linux-dpdk/include/odp_packet_io_internal.h index d1bdeeb62..eb81fc054 100644 --- a/platform/linux-dpdk/include/odp_packet_io_internal.h +++ b/platform/linux-dpdk/include/odp_packet_io_internal.h @@ -18,7 +18,7 @@ extern "C" { #endif -#include <odp_spinlock.h> +#include <odp/spinlock.h> #include <odp_packet_socket.h> #include <odp_align_internal.h> #include <odp_packet_dpdk.h> diff --git a/platform/linux-dpdk/include/odp_pool_internal.h b/platform/linux-dpdk/include/odp_pool_internal.h index 5fc333f74..38d82e701 100644 --- a/platform/linux-dpdk/include/odp_pool_internal.h +++ b/platform/linux-dpdk/include/odp_pool_internal.h @@ -18,13 +18,13 @@ extern "C" { #endif -#include <odp_std_types.h> -#include <odp_buffer_pool.h> +#include <odp/std_types.h> +#include <odp/pool.h> #include <odp_buffer_internal.h> -#include <odp_align.h> -#include <odp_hints.h> -#include <odp_config.h> -#include <odp_debug.h> +#include <odp/align.h> +#include <odp/hints.h> +#include <odp/config.h> +#include <odp/debug.h> #include <odp_debug_internal.h> /* for DPDK */ diff --git a/platform/linux-dpdk/odp_buffer.c b/platform/linux-dpdk/odp_buffer.c index 99357cd17..03ffc8640 100644 --- a/platform/linux-dpdk/odp_buffer.c +++ b/platform/linux-dpdk/odp_buffer.c @@ -4,9 +4,9 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_buffer.h> +#include <odp/buffer.h> #include <odp_buffer_internal.h> -#include <odp_buffer_pool_internal.h> +#include <odp_pool_internal.h> #include <string.h> #include <stdio.h> diff --git a/platform/linux-dpdk/odp_init.c b/platform/linux-dpdk/odp_init.c index 50d82e140..643005d6a 100644 --- a/platform/linux-dpdk/odp_init.c +++ b/platform/linux-dpdk/odp_init.c @@ -4,12 +4,12 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_init.h> +#include <odp/init.h> #include <odp_internal.h> -#include <odp_debug.h> +#include <odp/debug.h> #include <odp_packet_dpdk.h> #include <odp_debug_internal.h> -#include <odp_system_info.h> +#include <odp/system_info.h> int odp_init_dpdk(void) { diff --git a/platform/linux-dpdk/odp_linux.c b/platform/linux-dpdk/odp_linux.c index f25a08f76..cb8ffabd0 100644 --- a/platform/linux-dpdk/odp_linux.c +++ b/platform/linux-dpdk/odp_linux.c @@ -14,11 +14,11 @@ #include <stdio.h> #include <assert.h> -#include <odph_linux.h> +#include <odp/helper/linux.h> #include <odp_internal.h> -#include <odp_thread.h> -#include <odp_init.h> -#include <odp_system_info.h> +#include <odp/thread.h> +#include <odp/init.h> +#include <odp/system_info.h> #include <odp_debug_internal.h> #include <rte_lcore.h> diff --git a/platform/linux-dpdk/odp_packet.c b/platform/linux-dpdk/odp_packet.c index 5634f8150..999fdc008 100644 --- a/platform/linux-dpdk/odp_packet.c +++ b/platform/linux-dpdk/odp_packet.c @@ -4,14 +4,14 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_packet.h> +#include <odp/packet.h> #include <odp_packet_internal.h> -#include <odp_hints.h> -#include <odp_byteorder.h> +#include <odp/hints.h> +#include <odp/byteorder.h> #include <odp_debug_internal.h> -#include <odph_eth.h> -#include <odph_ip.h> +#include <odp/helper/eth.h> +#include <odp/helper/ip.h> #include <string.h> #include <stdio.h> diff --git a/platform/linux-dpdk/odp_packet_dpdk.c b/platform/linux-dpdk/odp_packet_dpdk.c index 6072ba8d6..5d0cf8c65 100644 --- a/platform/linux-dpdk/odp_packet_dpdk.c +++ b/platform/linux-dpdk/odp_packet_dpdk.c @@ -20,10 +20,10 @@ #include <linux/ethtool.h> #include <linux/sockios.h> -#include <odp_hints.h> -#include <odp_thread.h> +#include <odp/hints.h> +#include <odp/thread.h> -#include <odp_system_info.h> +#include <odp/system_info.h> #include <odp_debug_internal.h> #include <odp_packet_dpdk.h> #include <net/if.h> diff --git a/platform/linux-dpdk/odp_packet_io.c b/platform/linux-dpdk/odp_packet_io.c index f9e24fa83..60de67af3 100644 --- a/platform/linux-dpdk/odp_packet_io.c +++ b/platform/linux-dpdk/odp_packet_io.c @@ -4,16 +4,16 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_packet_io.h> +#include <odp/packet_io.h> #include <odp_packet_io_internal.h> #include <odp_packet_io_queue.h> -#include <odp_packet.h> +#include <odp/packet.h> #include <odp_packet_internal.h> #include <odp_internal.h> -#include <odp_spinlock.h> -#include <odp_shared_memory.h> +#include <odp/spinlock.h> +#include <odp/shared_memory.h> #include <odp_packet_socket.h> -#include <odp_config.h> +#include <odp/config.h> #include <odp_queue_internal.h> #include <odp_schedule_internal.h> #include <odp_debug_internal.h> diff --git a/platform/linux-dpdk/odp_pool.c b/platform/linux-dpdk/odp_pool.c index ea75248df..c9874debe 100644 --- a/platform/linux-dpdk/odp_pool.c +++ b/platform/linux-dpdk/odp_pool.c @@ -4,19 +4,19 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_std_types.h> -#include <odp_buffer_pool.h> -#include <odp_buffer_pool_internal.h> +#include <odp/std_types.h> +#include <odp/pool.h> +#include <odp_pool_internal.h> #include <odp_buffer_internal.h> #include <odp_packet_internal.h> #include <odp_timer_internal.h> #include <odp_align_internal.h> -#include <odp_shared_memory.h> -#include <odp_align.h> +#include <odp/shared_memory.h> +#include <odp/align.h> #include <odp_internal.h> -#include <odp_config.h> -#include <odp_hints.h> -#include <odp_debug.h> +#include <odp/config.h> +#include <odp/hints.h> +#include <odp/debug.h> #include <odp_debug_internal.h> #include <string.h> diff --git a/platform/linux-dpdk/odp_queue.c b/platform/linux-dpdk/odp_queue.c index ed9b9a85c..686f2491f 100644 --- a/platform/linux-dpdk/odp_queue.c +++ b/platform/linux-dpdk/odp_queue.c @@ -4,30 +4,30 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include <odp_queue.h> +#include <odp/queue.h> #include <odp_queue_internal.h> -#include <odp_std_types.h> -#include <odp_align.h> -#include <odp_buffer.h> +#include <odp/std_types.h> +#include <odp/align.h> +#include <odp/buffer.h> #include <odp_buffer_internal.h> -#include <odp_buffer_pool_internal.h> +#include <odp_pool_internal.h> #include <odp_internal.h> -#include <odp_shared_memory.h> +#include <odp/shared_memory.h> #include <odp_schedule_internal.h> -#include <odp_config.h> +#include <odp/config.h> #include <odp_packet_io_internal.h> #include <odp_packet_io_queue.h> -#include <odp_debug.h> -#include <odp_hints.h> +#include <odp/debug.h> +#include <odp/hints.h> #include <odp_debug_internal.h> #ifdef USE_TICKETLOCK -#include <odp_ticketlock.h> +#include <odp/ticketlock.h> #define LOCK(a) odp_ticketlock_lock(a) #define UNLOCK(a) odp_ticketlock_unlock(a) #define LOCK_INIT(a) odp_ticketlock_init(a) #else -#include <odp_spinlock.h> +#include <odp/spinlock.h> #define LOCK(a) odp_spinlock_lock(a) #define UNLOCK(a) odp_spinlock_unlock(a) #define LOCK_INIT(a) odp_spinlock_init(a) |