From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from keithw-W2600CR.windriver.com (97-94-195-106.dhcp.ftwo.tx.charter.com [97.94.195.106]) by dpdk.org (Postfix) with ESMTP id F36D3959 for ; Sun, 5 Oct 2014 01:03:32 +0200 (CEST) Received: from keithw-W2600CR.windriver.com (localhost.localdomain [127.0.0.1]) by keithw-W2600CR.windriver.com (8.14.4/8.14.4/Debian-4.1ubuntu1) with ESMTP id s94NAWvu125619; Sat, 4 Oct 2014 18:10:32 -0500 Received: (from keithw@localhost) by keithw-W2600CR.windriver.com (8.14.4/8.14.4/Submit) id s94NAVfq125612; Sat, 4 Oct 2014 18:10:31 -0500 From: Keith Wiles To: dev@dpdk.org Date: Sat, 4 Oct 2014 18:10:28 -0500 Message-Id: <1412464229-125521-1-git-send-email-keith.wiles@windriver.com> X-Mailer: git-send-email 2.1.0 Subject: [dpdk-dev] [PATCH 1/2] Move the error check inside __mempool_check_cookies() X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 04 Oct 2014 23:03:33 -0000 Three places check for the return value from __mempool_get_bulk to be zero and then call the debug routine __mempool_check_cookies(). The test is not required if moved into the debug routine. Minor cleanup and mostly does not effect performance, unless the is not removed by the compiler in the case where teh debug routine is not defined. Signed-off-by: Keith Wiles --- lib/librte_mempool/rte_mempool.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h index 597cf4f..154fdd4 100644 --- a/lib/librte_mempool/rte_mempool.h +++ b/lib/librte_mempool/rte_mempool.h @@ -325,6 +325,9 @@ static inline void __mempool_check_cookies(const struct rte_mempool *mp, void *obj; void **obj_table; + if ( n < 0 ) + return; + /* Force to drop the "const" attribute. This is done only when * DEBUG is enabled */ tmp = (void *) obj_table_const; @@ -1029,8 +1032,7 @@ rte_mempool_mc_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned n) { int ret; ret = __mempool_get_bulk(mp, obj_table, n, 1); - if (ret == 0) - __mempool_check_cookies(mp, obj_table, n, 1); + __mempool_check_cookies(mp, obj_table, n, 1); return ret; } @@ -1058,8 +1060,7 @@ rte_mempool_sc_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned n) { int ret; ret = __mempool_get_bulk(mp, obj_table, n, 0); - if (ret == 0) - __mempool_check_cookies(mp, obj_table, n, 1); + __mempool_check_cookies(mp, obj_table, n, 1); return ret; } @@ -1091,8 +1092,7 @@ rte_mempool_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned n) int ret; ret = __mempool_get_bulk(mp, obj_table, n, !(mp->flags & MEMPOOL_F_SC_GET)); - if (ret == 0) - __mempool_check_cookies(mp, obj_table, n, 1); + __mempool_check_cookies(mp, obj_table, n, 1); return ret; } -- 2.1.0