mempool: remove unused flags argument

* Remove redundant 'flags' API description from
  - __mempool_generic_put
  - __mempool_generic_get
  - rte_mempool_generic_put
  - rte_mempool_generic_get

* Remove unused 'flags' argument from
  - rte_mempool_generic_put
  - rte_mempool_generic_get

Signed-off-by: Santosh Shukla <santosh.shukla@caviumnetworks.com>
Signed-off-by: Jerin Jacob <jerin.jacob@caviumnetworks.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>

diff --git a/lib/librte_mempool/rte_mempool.h b/lib/librte_mempool/rte_mempool.h
index 76b5b3b..ec38844 100644 (file)
--- a/lib/librte_mempool/rte_mempool.h
+++ b/lib/librte_mempool/rte_mempool.h
@@ -1034,13 +1034,10 @@ rte_mempool_default_cache(struct rte_mempool *mp, unsigned lcore_id)
  *   positive.
  * @param cache
  *   A pointer to a mempool cache structure. May be NULL if not needed.
- * @param flags
- *   The flags used for the mempool creation.
- *   Single-producer (MEMPOOL_F_SP_PUT flag) or multi-producers.
  */
 static __rte_always_inline void
 __mempool_generic_put(struct rte_mempool *mp, void * const *obj_table,
-                     unsigned n, struct rte_mempool_cache *cache)
+                     unsigned int n, struct rte_mempool_cache *cache)
 {
        void **cache_objs;
 
@@ -1096,14 +1093,10 @@ ring_enqueue:
  *   The number of objects to add in the mempool from the obj_table.
  * @param cache
  *   A pointer to a mempool cache structure. May be NULL if not needed.
- * @param flags
- *   The flags used for the mempool creation.
- *   Single-producer (MEMPOOL_F_SP_PUT flag) or multi-producers.
  */
 static __rte_always_inline void
 rte_mempool_generic_put(struct rte_mempool *mp, void * const *obj_table,
-                       unsigned n, struct rte_mempool_cache *cache,
-                       __rte_unused int flags)
+                       unsigned int n, struct rte_mempool_cache *cache)
 {
        __mempool_check_cookies(mp, obj_table, n, 0);
        __mempool_generic_put(mp, obj_table, n, cache);
@@ -1125,11 +1118,11 @@ rte_mempool_generic_put(struct rte_mempool *mp, void * const *obj_table,
  */
 static __rte_always_inline void
 rte_mempool_put_bulk(struct rte_mempool *mp, void * const *obj_table,
-                    unsigned n)
+                    unsigned int n)
 {
        struct rte_mempool_cache *cache;
        cache = rte_mempool_default_cache(mp, rte_lcore_id());
-       rte_mempool_generic_put(mp, obj_table, n, cache, mp->flags);
+       rte_mempool_generic_put(mp, obj_table, n, cache);
 }
 
 /**
@@ -1160,16 +1153,13 @@ rte_mempool_put(struct rte_mempool *mp, void *obj)
  *   The number of objects to get, must be strictly positive.
  * @param cache
  *   A pointer to a mempool cache structure. May be NULL if not needed.
- * @param flags
- *   The flags used for the mempool creation.
- *   Single-consumer (MEMPOOL_F_SC_GET flag) or multi-consumers.
  * @return
  *   - >=0: Success; number of objects supplied.
  *   - <0: Error; code of ring dequeue function.
  */
 static __rte_always_inline int
 __mempool_generic_get(struct rte_mempool *mp, void **obj_table,
-                     unsigned n, struct rte_mempool_cache *cache)
+                     unsigned int n, struct rte_mempool_cache *cache)
 {
        int ret;
        uint32_t index, len;
@@ -1241,16 +1231,13 @@ ring_dequeue:
  *   The number of objects to get from mempool to obj_table.
  * @param cache
  *   A pointer to a mempool cache structure. May be NULL if not needed.
- * @param flags
- *   The flags used for the mempool creation.
- *   Single-consumer (MEMPOOL_F_SC_GET flag) or multi-consumers.
  * @return
  *   - 0: Success; objects taken.
  *   - -ENOENT: Not enough entries in the mempool; no object is retrieved.
  */
 static __rte_always_inline int
-rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table, unsigned n,
-                       struct rte_mempool_cache *cache, __rte_unused int flags)
+rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table,
+                       unsigned int n, struct rte_mempool_cache *cache)
 {
        int ret;
        ret = __mempool_generic_get(mp, obj_table, n, cache);
@@ -1282,11 +1269,11 @@ rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table, unsigned n,
  *   - -ENOENT: Not enough entries in the mempool; no object is retrieved.
  */
 static __rte_always_inline int
-rte_mempool_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned n)
+rte_mempool_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned int n)
 {
        struct rte_mempool_cache *cache;
        cache = rte_mempool_default_cache(mp, rte_lcore_id());
-       return rte_mempool_generic_get(mp, obj_table, n, cache, mp->flags);
+       return rte_mempool_generic_get(mp, obj_table, n, cache);
 }
 
 /**

diff --git a/test/test/test_mempool.c b/test/test/test_mempool.c
index 0a44239..47dc3ac 100644 (file)
--- a/test/test/test_mempool.c
+++ b/test/test/test_mempool.c
@@ -129,7 +129,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache)
        rte_mempool_dump(stdout, mp);
 
        printf("get an object\n");
-       if (rte_mempool_generic_get(mp, &obj, 1, cache, 0) < 0)
+       if (rte_mempool_generic_get(mp, &obj, 1, cache) < 0)
                GOTO_ERR(ret, out);
        rte_mempool_dump(stdout, mp);
 
@@ -152,21 +152,21 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache)
 #endif
 
        printf("put the object back\n");
-       rte_mempool_generic_put(mp, &obj, 1, cache, 0);
+       rte_mempool_generic_put(mp, &obj, 1, cache);
        rte_mempool_dump(stdout, mp);
 
        printf("get 2 objects\n");
-       if (rte_mempool_generic_get(mp, &obj, 1, cache, 0) < 0)
+       if (rte_mempool_generic_get(mp, &obj, 1, cache) < 0)
                GOTO_ERR(ret, out);
-       if (rte_mempool_generic_get(mp, &obj2, 1, cache, 0) < 0) {
-               rte_mempool_generic_put(mp, &obj, 1, cache, 0);
+       if (rte_mempool_generic_get(mp, &obj2, 1, cache) < 0) {
+               rte_mempool_generic_put(mp, &obj, 1, cache);
                GOTO_ERR(ret, out);
        }
        rte_mempool_dump(stdout, mp);
 
        printf("put the objects back\n");
-       rte_mempool_generic_put(mp, &obj, 1, cache, 0);
-       rte_mempool_generic_put(mp, &obj2, 1, cache, 0);
+       rte_mempool_generic_put(mp, &obj, 1, cache);
+       rte_mempool_generic_put(mp, &obj2, 1, cache);
        rte_mempool_dump(stdout, mp);
 
        /*
@@ -178,7 +178,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache)
                GOTO_ERR(ret, out);
 
        for (i = 0; i < MEMPOOL_SIZE; i++) {
-               if (rte_mempool_generic_get(mp, &objtable[i], 1, cache, 0) < 0)
+               if (rte_mempool_generic_get(mp, &objtable[i], 1, cache) < 0)
                        break;
        }
 
@@ -200,7 +200,7 @@ test_mempool_basic(struct rte_mempool *mp, int use_external_cache)
                                ret = -1;
                }
 
-               rte_mempool_generic_put(mp, &objtable[i], 1, cache, 0);
+               rte_mempool_generic_put(mp, &objtable[i], 1, cache);
        }
 
        free(objtable);

diff --git a/test/test/test_mempool_perf.c b/test/test/test_mempool_perf.c
index 07b28c0..3b8f7de 100644 (file)
--- a/test/test/test_mempool_perf.c
+++ b/test/test/test_mempool_perf.c
@@ -186,7 +186,7 @@ per_lcore_mempool_test(void *arg)
                                ret = rte_mempool_generic_get(mp,
                                                              &obj_table[idx],
                                                              n_get_bulk,
-                                                             cache, 0);
+                                                             cache);
                                if (unlikely(ret < 0)) {
                                        rte_mempool_dump(stdout, mp);
                                        /* in this case, objects are lost... */
@@ -200,7 +200,7 @@ per_lcore_mempool_test(void *arg)
                        while (idx < n_keep) {
                                rte_mempool_generic_put(mp, &obj_table[idx],
                                                        n_put_bulk,
-                                                       cache, 0);
+                                                       cache);
                                idx += n_put_bulk;
                        }
                }