[dpdk-dev] [PATCH] Remove n_orig from __mempool_get_bulk() routine, cleanup comment.

[Wiles, Roger Keith]

Cleanup the code some to remove n_orig variable that was not required.          
                                                    
Update the comments to __mempool_get_bulk to state the correct return value.    
                                                   

Signed-off-by: Keith Wiles <keith.wiles at windriver.com>                       
                                                       
---                                                                             
                                                    
 lib/librte_mempool/rte_mempool.h | 11 ++++-------                              
                                                    
 1 file changed, 4 insertions(+), 7 deletions(-)                                
                                                    

diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 95f19f9..597cf4f 100644
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -937,7 +937,7 @@ rte_mempool_put(struct rte_mempool *mp, void *obj)
  * @param is_mc
  *   Mono-consumer (0) or multi-consumers (1).
  * @return
- *   - >=0: Success; number of objects supplied.
+ *   - 0: Success; number of objects requested.
  *   - <0: Error; code of ring dequeue function.
  */
 static inline int __attribute__((always_inline))
@@ -945,9 +945,6 @@ __mempool_get_bulk(struct rte_mempool *mp, void **obj_table,
                   unsigned n, int is_mc)
 {
        int ret;
-#ifdef RTE_LIBRTE_MEMPOOL_DEBUG
-       unsigned n_orig = n;
-#endif
 #if RTE_MEMPOOL_CACHE_MAX_SIZE > 0
        struct rte_mempool_cache *cache;
        uint32_t index, len;
@@ -988,7 +985,7 @@ __mempool_get_bulk(struct rte_mempool *mp, void **obj_table,

        cache->len -= n;

-       __MEMPOOL_STAT_ADD(mp, get_success, n_orig);
+       __MEMPOOL_STAT_ADD(mp, get_success, n);

        return 0;

@@ -1002,9 +999,9 @@ ring_dequeue:
                ret = rte_ring_sc_dequeue_bulk(mp->ring, obj_table, n);

        if (ret < 0)
-               __MEMPOOL_STAT_ADD(mp, get_fail, n_orig);
+               __MEMPOOL_STAT_ADD(mp, get_fail, n);
        else
-               __MEMPOOL_STAT_ADD(mp, get_success, n_orig);
+               __MEMPOOL_STAT_ADD(mp, get_success, n);

        return ret;
 }
-- 
2.1.0

Keith Wiles, Principal Technologist with CTO office, Wind River mobile 
972-213-5533