In rte_mempool_ring.c, the committer uses the symbol ENOBUFS to
describe the return value of function common_ring_sc_dequeue,
but in rte_mempool.h, the symbol ENOENT is used to describe
the return value of function rte_mempool_get. If the user of
dpdk uses the symbol ENOENT as the judgment condition of
the return value, it may cause some abnormal phenomena
in their own programs, such as when the mempool space is exhausted.
v2:
* Update the descriptions of underlying functions.
v3:
* Correct the description that the return value cannot be greater than 0
* Update the description of the dequeue function prototype
Signed-off-by: Zhiheng Chen <chenzhiheng0...@gmail.com>
---
lib/mempool/rte_mempool.h | 34 ++++++++++++++++++++++------------
1 file changed, 22 insertions(+), 12 deletions(-)
diff --git a/lib/mempool/rte_mempool.h b/lib/mempool/rte_mempool.h
index 1e7a3c1527..cae81d8a32 100644
--- a/lib/mempool/rte_mempool.h
+++ b/lib/mempool/rte_mempool.h
@@ -447,6 +447,16 @@ typedef int (*rte_mempool_enqueue_t)(struct rte_mempool
*mp,
/**
* Dequeue an object from the external pool.
+ *
+ * @param mp
+ * Pointer to the memory pool.
+ * @param obj_table
+ * Pointer to a table of void * pointers (objects).
+ * @param n
+ * Number of objects to get.
+ * @return
+ * - 0: Success; got n objects.
+ * - -ENOBUFS: Not enough entries in the mempool; no object is retrieved.
*/
typedef int (*rte_mempool_dequeue_t)(struct rte_mempool *mp,
void **obj_table, unsigned int n);
@@ -738,7 +748,7 @@ rte_mempool_ops_alloc(struct rte_mempool *mp);
* Number of objects to get.
* @return
* - 0: Success; got n objects.
- * - <0: Error; code of dequeue function.
+ * - -ENOBUFS: Not enough entries in the mempool; no object is retrieved.
*/
static inline int
rte_mempool_ops_dequeue_bulk(struct rte_mempool *mp,
@@ -1452,8 +1462,8 @@ rte_mempool_put(struct rte_mempool *mp, void *obj)
* @param cache
* A pointer to a mempool cache structure. May be NULL if not needed.
* @return
- * - >=0: Success; number of objects supplied.
- * - <0: Error; code of ring dequeue function.
+ * - 0: Success; got n objects.
+ * - -ENOBUFS: Not enough entries in the mempool; no object is retrieved.
*/
static __rte_always_inline int
rte_mempool_do_generic_get(struct rte_mempool *mp, void **obj_table,
@@ -1521,7 +1531,7 @@ rte_mempool_do_generic_get(struct rte_mempool *mp, void
**obj_table,
* Get several objects from the mempool.
*
* If cache is enabled, objects will be retrieved first from cache,
- * subsequently from the common pool. Note that it can return -ENOENT when
+ * subsequently from the common pool. Note that it can return -ENOBUFS when
* the local cache and common pool are empty, even if cache from other
* lcores are full.
*
@@ -1534,8 +1544,8 @@ rte_mempool_do_generic_get(struct rte_mempool *mp, void
**obj_table,
* @param cache
* A pointer to a mempool cache structure. May be NULL if not needed.
* @return
- * - 0: Success; objects taken.
- * - -ENOENT: Not enough entries in the mempool; no object is retrieved.
+ * - 0: Success; got n objects.
+ * - -ENOBUFS: 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,
@@ -1557,7 +1567,7 @@ rte_mempool_generic_get(struct rte_mempool *mp, void
**obj_table,
* mempool creation time (see flags).
*
* If cache is enabled, objects will be retrieved first from cache,
- * subsequently from the common pool. Note that it can return -ENOENT when
+ * subsequently from the common pool. Note that it can return -ENOBUFS when
* the local cache and common pool are empty, even if cache from other
* lcores are full.
*
@@ -1568,8 +1578,8 @@ rte_mempool_generic_get(struct rte_mempool *mp, void
**obj_table,
* @param n
* The number of objects to get from the mempool to obj_table.
* @return
- * - 0: Success; objects taken
- * - -ENOENT: Not enough entries in the mempool; no object is retrieved.
+ * - 0: Success; got n objects.
+ * - -ENOBUFS: 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 int n)
@@ -1588,7 +1598,7 @@ rte_mempool_get_bulk(struct rte_mempool *mp, void
**obj_table, unsigned int n)
* mempool creation (see flags).
*
* If cache is enabled, objects will be retrieved first from cache,
- * subsequently from the common pool. Note that it can return -ENOENT when
+ * subsequently from the common pool. Note that it can return -ENOBUFS when
* the local cache and common pool are empty, even if cache from other
* lcores are full.
*
@@ -1597,8 +1607,8 @@ rte_mempool_get_bulk(struct rte_mempool *mp, void
**obj_table, unsigned int n)
* @param obj_p
* A pointer to a void * pointer (object) that will be filled.
* @return
- * - 0: Success; objects taken.
- * - -ENOENT: Not enough entries in the mempool; no object is retrieved.
+ * - 0: Success; got n objects.
+ * - -ENOBUFS: Not enough entries in the mempool; no object is retrieved.
*/
static __rte_always_inline int
rte_mempool_get(struct rte_mempool *mp, void **obj_p)
--
2.32.0
