From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by dpdk.org (Postfix) with ESMTP id A0FA26CB4 for ; Thu, 23 Feb 2017 18:25:11 +0100 (CET) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga105.jf.intel.com with ESMTP; 23 Feb 2017 09:25:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.35,198,1484035200"; d="scan'208";a="827713172" Received: from sivswdev01.ir.intel.com ([10.237.217.45]) by FMSMGA003.fm.intel.com with ESMTP; 23 Feb 2017 09:25:10 -0800 From: Bruce Richardson To: olivier.matz@6wind.com Cc: dev@dpdk.org, Bruce Richardson Date: Thu, 23 Feb 2017 17:24:06 +0000 Message-Id: <20170223172407.27664-14-bruce.richardson@intel.com> X-Mailer: git-send-email 2.8.4 In-Reply-To: <20170223172407.27664-1-bruce.richardson@intel.com> References: <20170223172407.27664-1-bruce.richardson@intel.com> Subject: [dpdk-dev] [PATCH v1 13/14] ring: create common function for updating tail idx X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 23 Feb 2017 17:25:12 -0000 Both producer and consumer use the same logic for updating the tail index so merge into a single function. Signed-off-by: Bruce Richardson --- lib/librte_ring/rte_ring.h | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h index d10b7d1..6b901b1 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -336,6 +336,19 @@ void rte_ring_dump(FILE *f, const struct rte_ring *r); } \ } while (0) +static inline __attribute__((always_inline)) void +update_tail(struct rte_ring_ht_ptr *ht_ptr, uint32_t old_val, uint32_t new_val) +{ + /* + * If there are other enqueues/dequeues in progress that preceded us, + * we need to wait for them to complete + */ + while (unlikely(ht_ptr->tail != old_val)) + rte_pause(); + + ht_ptr->tail = new_val; +} + /** * @internal This function updates the producer head for enqueue * @@ -435,15 +448,7 @@ __rte_ring_do_enqueue(struct rte_ring *r, void * const *obj_table, ENQUEUE_PTRS(); rte_smp_wmb(); - /* - * If there are other enqueues in progress that preceded us, - * we need to wait for them to complete - */ - while (unlikely(r->prod.tail != prod_head)) - rte_pause(); - - r->prod.tail = prod_next; - + update_tail(&r->prod, prod_head, prod_next); end: if (free_space != NULL) *free_space = free_entries - n; @@ -548,14 +553,7 @@ __rte_ring_do_dequeue(struct rte_ring *r, void **obj_table, DEQUEUE_PTRS(); rte_smp_rmb(); - /* - * If there are other enqueues in progress that preceded us, - * we need to wait for them to complete - */ - while (unlikely(r->cons.tail != cons_head)) - rte_pause(); - - r->cons.tail = cons_next; + update_tail(&r->cons, cons_head, cons_next); end: if (available != NULL) -- 2.9.3