diff options
| author | Matias Elo <matias.elo@nokia.com> | 2022-11-07 09:53:55 +0200 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2022-11-17 14:09:14 +0200 |
| commit | d8c1ae803653155d7375b331178461d421159d8f (patch) | |
| tree | db8eb558b9e2dc6cf870549c004ad920e2d3b744 /platform/linux-dpdk/include/odp/api | |
| parent | 08bb08813855aaf3ed6984315ea9b7fb3301caef (diff) | |
Port 30fba5dd7 "linux-gen: event: add debug type checks to event conversion functions"
Port original commit from linux-generic.
Signed-off-by: Matias Elo <matias.elo@nokia.com>
Reviewed-by: Jere Leppänen <jere.leppanen@nokia.com>
Diffstat (limited to 'platform/linux-dpdk/include/odp/api')
3 files changed, 14 insertions, 7 deletions
diff --git a/platform/linux-dpdk/include/odp/api/plat/buffer_inlines.h b/platform/linux-dpdk/include/odp/api/plat/buffer_inlines.h index a47f9ad70..8e506e764 100644 --- a/platform/linux-dpdk/include/odp/api/plat/buffer_inlines.h +++ b/platform/linux-dpdk/include/odp/api/plat/buffer_inlines.h @@ -7,12 +7,13 @@ #ifndef ODP_PLAT_BUFFER_INLINES_H_ #define ODP_PLAT_BUFFER_INLINES_H_ -#include <odp/api/event_types.h> +#include <odp/api/event.h> #include <odp/api/hints.h> #include <odp/api/pool_types.h> #include <odp/api/abi/buffer.h> +#include <odp/api/plat/debug_inlines.h> #include <odp/api/plat/event_inline_types.h> #include <rte_mbuf.h> @@ -45,6 +46,8 @@ extern const _odp_event_inline_offset_t _odp_event_inline_offset; _ODP_INLINE odp_buffer_t odp_buffer_from_event(odp_event_t ev) { + _ODP_ASSERT(odp_event_type(ev) == ODP_EVENT_BUFFER); + return (odp_buffer_t)ev; } diff --git a/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h b/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h index 91d302cd9..52eaf95e5 100644 --- a/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h +++ b/platform/linux-dpdk/include/odp/api/plat/packet_inlines.h @@ -18,16 +18,13 @@ extern "C" { #endif +#include <odp/api/event.h> #include <odp/api/hints.h> #include <odp/api/packet_types.h> #include <odp/api/pool_types.h> #include <odp/api/time.h> -#include <odp/api/abi/buffer.h> -#include <odp/api/abi/event_types.h> -#include <odp/api/abi/packet.h> -#include <odp/api/abi/packet_io.h> - +#include <odp/api/plat/debug_inlines.h> #include <odp/api/plat/packet_io_inlines.h> #include <odp/api/plat/packet_inline_types.h> #include <odp/api/plat/pool_inline_types.h> @@ -611,6 +608,8 @@ _ODP_INLINE int odp_packet_copy_from_mem(odp_packet_t pkt, uint32_t offset, _ODP_INLINE odp_packet_t odp_packet_from_event(odp_event_t ev) { + _ODP_ASSERT(odp_event_type(ev) == ODP_EVENT_PACKET); + return (odp_packet_t)ev; } @@ -645,6 +644,8 @@ _ODP_INLINE odp_event_subtype_t odp_packet_subtype(odp_packet_t pkt) _ODP_INLINE odp_packet_tx_compl_t odp_packet_tx_compl_from_event(odp_event_t ev) { + _ODP_ASSERT(odp_event_type(ev) == ODP_EVENT_PACKET_TX_COMPL); + return (odp_packet_tx_compl_t)(uintptr_t)ev; } diff --git a/platform/linux-dpdk/include/odp/api/plat/timer_inlines.h b/platform/linux-dpdk/include/odp/api/plat/timer_inlines.h index 48154a26f..f8ff5c938 100644 --- a/platform/linux-dpdk/include/odp/api/plat/timer_inlines.h +++ b/platform/linux-dpdk/include/odp/api/plat/timer_inlines.h @@ -7,9 +7,10 @@ #ifndef ODP_PLAT_TIMER_INLINES_H_ #define ODP_PLAT_TIMER_INLINES_H_ -#include <odp/api/event_types.h> +#include <odp/api/event.h> #include <odp/api/timer_types.h> +#include <odp/api/plat/debug_inlines.h> #include <odp/api/plat/timer_inline_types.h> #include <stdint.h> @@ -53,6 +54,8 @@ _ODP_INLINE void *odp_timeout_user_area(odp_timeout_t tmo) _ODP_INLINE odp_timeout_t odp_timeout_from_event(odp_event_t ev) { + _ODP_ASSERT(odp_event_type(ev) == ODP_EVENT_TIMEOUT); + return (odp_timeout_t)ev; } |