diff options
| author | Matias Elo <matias.elo@nokia.com> | 2022-09-08 14:27:52 +0300 |
|---|---|---|
| committer | Matias Elo <matias.elo@nokia.com> | 2022-09-23 09:43:29 +0300 |
| commit | 382572e149c4a5801301e10b4938fdcf0999c3f6 (patch) | |
| tree | 8ef54d945e4bb7b4202b1d3af65255120700dc1c /platform/linux-dpdk/odp_queue_spsc.c | |
| parent | cad7fcbd3f193037ab07dd0ebe8e62ec2e763bbb (diff) | |
Port 1f683c665 "linux-gen: queue: remove an extra level of hierarchy from queue_entry_t"
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/odp_queue_spsc.c')
| -rw-r--r-- | platform/linux-dpdk/odp_queue_spsc.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/platform/linux-dpdk/odp_queue_spsc.c b/platform/linux-dpdk/odp_queue_spsc.c index dc74c9595..a5a31498d 100644 --- a/platform/linux-dpdk/odp_queue_spsc.c +++ b/platform/linux-dpdk/odp_queue_spsc.c @@ -17,9 +17,9 @@ static inline int spsc_enq_multi(odp_queue_t handle, ring_spsc_t ring_spsc; queue = qentry_from_handle(handle); - ring_spsc = queue->s.ring_spsc; + ring_spsc = queue->ring_spsc; - if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) { + if (odp_unlikely(queue->status < QUEUE_STATUS_READY)) { ODP_ERR("Bad queue status\n"); return -1; } @@ -34,9 +34,9 @@ static inline int spsc_deq_multi(odp_queue_t handle, ring_spsc_t ring_spsc; queue = qentry_from_handle(handle); - ring_spsc = queue->s.ring_spsc; + ring_spsc = queue->ring_spsc; - if (odp_unlikely(queue->s.status < QUEUE_STATUS_READY)) { + if (odp_unlikely(queue->status < QUEUE_STATUS_READY)) { /* Bad queue, or queue has been destroyed. */ return -1; } @@ -83,13 +83,13 @@ static _odp_event_hdr_t *queue_spsc_deq(odp_queue_t handle) void _odp_queue_spsc_init(queue_entry_t *queue, uint32_t queue_size) { - queue->s.enqueue = queue_spsc_enq; - queue->s.dequeue = queue_spsc_deq; - queue->s.enqueue_multi = queue_spsc_enq_multi; - queue->s.dequeue_multi = queue_spsc_deq_multi; - queue->s.orig_dequeue_multi = queue_spsc_deq_multi; - - queue->s.ring_spsc = ring_spsc_create(queue->s.name, queue_size); - if (queue->s.ring_spsc == NULL) + queue->enqueue = queue_spsc_enq; + queue->dequeue = queue_spsc_deq; + queue->enqueue_multi = queue_spsc_enq_multi; + queue->dequeue_multi = queue_spsc_deq_multi; + queue->orig_dequeue_multi = queue_spsc_deq_multi; + + queue->ring_spsc = ring_spsc_create(queue->name, queue_size); + if (queue->ring_spsc == NULL) ODP_ABORT("Creating SPSC ring failed\n"); } |