diff options
Diffstat (limited to 'platform/linux-dpdk/odp_queue_eventdev.c')
-rw-r--r-- | platform/linux-dpdk/odp_queue_eventdev.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/platform/linux-dpdk/odp_queue_eventdev.c b/platform/linux-dpdk/odp_queue_eventdev.c index b650874ec..b474a515c 100644 --- a/platform/linux-dpdk/odp_queue_eventdev.c +++ b/platform/linux-dpdk/odp_queue_eventdev.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2019, Nokia +/* Copyright (c) 2019-2021, Nokia * All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause @@ -13,7 +13,7 @@ #include <odp/api/plat/queue_inline_types.h> #include <odp/api/plat/ticketlock_inlines.h> #include <odp_config_internal.h> -#include <odp_buffer_internal.h> +#include <odp_event_internal.h> #include <odp_debug_internal.h> #include <odp_libconfig_internal.h> #include <odp_queue_if.h> @@ -822,7 +822,7 @@ static odp_queue_t queue_lookup(const char *name) } static inline int _plain_queue_enq_multi(odp_queue_t handle, - odp_buffer_hdr_t *buf_hdr[], int num) + _odp_event_hdr_t *event_hdr[], int num) { queue_entry_t *queue; int num_enq; @@ -831,13 +831,13 @@ static inline int _plain_queue_enq_multi(odp_queue_t handle, queue = qentry_from_handle(handle); ring_mpmc = queue->s.ring_mpmc; - num_enq = ring_mpmc_enq_multi(ring_mpmc, (void **)buf_hdr, num); + num_enq = ring_mpmc_enq_multi(ring_mpmc, (void **)event_hdr, num); return num_enq; } static inline int _plain_queue_deq_multi(odp_queue_t handle, - odp_buffer_hdr_t *buf_hdr[], int num) + _odp_event_hdr_t *event_hdr[], int num) { int num_deq; queue_entry_t *queue; @@ -846,22 +846,22 @@ static inline int _plain_queue_deq_multi(odp_queue_t handle, queue = qentry_from_handle(handle); ring_mpmc = queue->s.ring_mpmc; - num_deq = ring_mpmc_deq_multi(ring_mpmc, (void **)buf_hdr, num); + num_deq = ring_mpmc_deq_multi(ring_mpmc, (void **)event_hdr, num); return num_deq; } static int plain_queue_enq_multi(odp_queue_t handle, - odp_buffer_hdr_t *buf_hdr[], int num) + _odp_event_hdr_t *event_hdr[], int num) { - return _plain_queue_enq_multi(handle, buf_hdr, num); + return _plain_queue_enq_multi(handle, event_hdr, num); } -static int plain_queue_enq(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr) +static int plain_queue_enq(odp_queue_t handle, _odp_event_hdr_t *event_hdr) { int ret; - ret = _plain_queue_enq_multi(handle, &buf_hdr, 1); + ret = _plain_queue_enq_multi(handle, &event_hdr, 1); if (ret == 1) return 0; @@ -870,27 +870,27 @@ static int plain_queue_enq(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr) } static int plain_queue_deq_multi(odp_queue_t handle, - odp_buffer_hdr_t *buf_hdr[], int num) + _odp_event_hdr_t *event_hdr[], int num) { - return _plain_queue_deq_multi(handle, buf_hdr, num); + return _plain_queue_deq_multi(handle, event_hdr, num); } -static odp_buffer_hdr_t *plain_queue_deq(odp_queue_t handle) +static _odp_event_hdr_t *plain_queue_deq(odp_queue_t handle) { - odp_buffer_hdr_t *buf_hdr = NULL; + _odp_event_hdr_t *event_hdr = NULL; int ret; - ret = _plain_queue_deq_multi(handle, &buf_hdr, 1); + ret = _plain_queue_deq_multi(handle, &event_hdr, 1); if (ret == 1) - return buf_hdr; + return event_hdr; else return NULL; } -static int error_enqueue(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr) +static int error_enqueue(odp_queue_t handle, _odp_event_hdr_t *event_hdr) { - (void)buf_hdr; + (void)event_hdr; ODP_ERR("Enqueue not supported (0x%" PRIx64 ")\n", odp_queue_to_u64(handle)); @@ -899,10 +899,10 @@ static int error_enqueue(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr) } static int error_enqueue_multi(odp_queue_t handle, - odp_buffer_hdr_t *buf_hdr[], int num) + _odp_event_hdr_t *event_hdr[], int num) { - (void)buf_hdr; + (void)event_hdr; (void)num; ODP_ERR("Enqueue multi not supported (0x%" PRIx64 ")\n", @@ -911,7 +911,7 @@ static int error_enqueue_multi(odp_queue_t handle, return -1; } -static odp_buffer_hdr_t *error_dequeue(odp_queue_t handle) +static _odp_event_hdr_t *error_dequeue(odp_queue_t handle) { ODP_ERR("Dequeue not supported (0x%" PRIx64 ")\n", odp_queue_to_u64(handle)); @@ -920,9 +920,9 @@ static odp_buffer_hdr_t *error_dequeue(odp_queue_t handle) } static int error_dequeue_multi(odp_queue_t handle, - odp_buffer_hdr_t *buf_hdr[], int num) + _odp_event_hdr_t *event_hdr[], int num) { - (void)buf_hdr; + (void)event_hdr; (void)num; ODP_ERR("Dequeue multi not supported (0x%" PRIx64 ")\n", @@ -1068,7 +1068,7 @@ static void queue_print(odp_queue_t handle) } static inline int _sched_queue_enq_multi(odp_queue_t handle, - odp_buffer_hdr_t *buf_hdr[], int num) + _odp_event_hdr_t *event_hdr[], int num) { queue_entry_t *queue; struct rte_event ev[CONFIG_BURST_SIZE]; @@ -1110,7 +1110,7 @@ static inline int _sched_queue_enq_multi(odp_queue_t handle, ev[i].event_type = RTE_EVENT_TYPE_CPU; ev[i].sub_event_type = 0; ev[i].priority = priority; - ev[i].mbuf = &buf_hdr[i]->mb; + ev[i].mbuf = &event_hdr[i]->mb; } num_enq = rte_event_enqueue_new_burst(dev_id, port_id, ev, num); @@ -1119,16 +1119,16 @@ static inline int _sched_queue_enq_multi(odp_queue_t handle, } static int sched_queue_enq_multi(odp_queue_t handle, - odp_buffer_hdr_t *buf_hdr[], int num) + _odp_event_hdr_t *event_hdr[], int num) { - return _sched_queue_enq_multi(handle, buf_hdr, num); + return _sched_queue_enq_multi(handle, event_hdr, num); } -static int sched_queue_enq(odp_queue_t handle, odp_buffer_hdr_t *buf_hdr) +static int sched_queue_enq(odp_queue_t handle, _odp_event_hdr_t *event_hdr) { int ret; - ret = _sched_queue_enq_multi(handle, &buf_hdr, 1); + ret = _sched_queue_enq_multi(handle, &event_hdr, 1); if (ret == 1) return 0; @@ -1271,11 +1271,11 @@ static void queue_set_enq_deq_func(odp_queue_t handle, } static int queue_orig_multi(odp_queue_t handle, - odp_buffer_hdr_t **buf_hdr, int num) + _odp_event_hdr_t **event_hdr, int num) { queue_entry_t *queue = qentry_from_handle(handle); - return queue->s.orig_dequeue_multi(handle, buf_hdr, num); + return queue->s.orig_dequeue_multi(handle, event_hdr, num); } static int queue_api_enq_multi(odp_queue_t handle, @@ -1290,7 +1290,7 @@ static int queue_api_enq_multi(odp_queue_t handle, num = QUEUE_MULTI_MAX; return queue->s.enqueue_multi(handle, - (odp_buffer_hdr_t **)(uintptr_t)ev, num); + (_odp_event_hdr_t **)(uintptr_t)ev, num); } static void queue_timer_add(odp_queue_t handle) @@ -1312,7 +1312,7 @@ static int queue_api_enq(odp_queue_t handle, odp_event_t ev) queue_entry_t *queue = qentry_from_handle(handle); return queue->s.enqueue(handle, - (odp_buffer_hdr_t *)(uintptr_t)ev); + (_odp_event_hdr_t *)(uintptr_t)ev); } static int queue_api_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) @@ -1323,7 +1323,7 @@ static int queue_api_deq_multi(odp_queue_t handle, odp_event_t ev[], int num) if (num > QUEUE_MULTI_MAX) num = QUEUE_MULTI_MAX; - ret = queue->s.dequeue_multi(handle, (odp_buffer_hdr_t **)ev, num); + ret = queue->s.dequeue_multi(handle, (_odp_event_hdr_t **)ev, num); if (odp_global_rw->inline_timers && odp_atomic_load_u64(&queue->s.num_timers)) |