app/test: add unit test cases to mempool library
Checks
Commit Message
Added UT in mempool.c to cover below functions:
rte_mempool_populate_anon()
rte_mempool_memchunk_anon_free()
get_anon_size()
rte_mempool_mem_iter()
Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
---
app/test/test_mempool.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 74 insertions(+)
Comments
On Tue, Sep 10, 2019 at 02:25:27PM +0100, Pallantla Poornima wrote:
> Added UT in mempool.c to cover below functions:
> rte_mempool_populate_anon()
> rte_mempool_memchunk_anon_free()
> get_anon_size()
> rte_mempool_mem_iter()
>
> Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
Acked-by: Olivier Matz <olivier.matz@6wind.com>
On Thu, Oct 24, 2019 at 1:08 PM Olivier Matz <olivier.matz@6wind.com> wrote:
>
> On Tue, Sep 10, 2019 at 02:25:27PM +0100, Pallantla Poornima wrote:
> > Added UT in mempool.c to cover below functions:
> > rte_mempool_populate_anon()
> > rte_mempool_memchunk_anon_free()
> > get_anon_size()
Those two are internals of the mempool library.
Reworded the commitlog.
> > rte_mempool_mem_iter()
> >
> > Signed-off-by: Pallantla Poornima <pallantlax.poornima@intel.com>
>
> Acked-by: Olivier Matz <olivier.matz@6wind.com>
Applied, thanks.
@@ -26,6 +26,7 @@
#include <rte_spinlock.h>
#include <rte_malloc.h>
#include <rte_mbuf_pool_ops.h>
+#include <rte_mbuf.h>
#include "test.h"
@@ -453,14 +454,41 @@ walk_cb(struct rte_mempool *mp, void *userdata __rte_unused)
printf("\t%s\n", mp->name);
}
+struct mp_data {
+ int16_t ret;
+};
+
+static void
+test_mp_mem_init(struct rte_mempool *mp,
+ __rte_unused void *opaque,
+ __rte_unused struct rte_mempool_memhdr *memhdr,
+ __rte_unused unsigned int mem_idx)
+{
+ struct mp_data *data = opaque;
+
+ if (mp == NULL) {
+ data->ret = -1;
+ return;
+ }
+ /* nothing to be implemented here*/
+ data->ret = 0;
+}
+
static int
test_mempool(void)
{
int ret = -1;
+ uint32_t nb_objs = 0;
+ uint32_t nb_mem_chunks = 0;
struct rte_mempool *mp_cache = NULL;
struct rte_mempool *mp_nocache = NULL;
+ struct rte_mempool *mp_stack_anon = NULL;
+ struct rte_mempool *mp_stack_mempool_iter = NULL;
struct rte_mempool *mp_stack = NULL;
struct rte_mempool *default_pool = NULL;
+ struct mp_data cb_arg = {
+ .ret = -1
+ };
const char *default_pool_ops = rte_mbuf_best_mempool_ops();
rte_atomic32_init(&synchro);
@@ -490,6 +518,50 @@ test_mempool(void)
goto err;
}
+ /* create an empty mempool */
+ mp_stack_anon = rte_mempool_create_empty("test_stack_anon",
+ MEMPOOL_SIZE,
+ MEMPOOL_ELT_SIZE,
+ RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
+ SOCKET_ID_ANY, 0);
+
+ if (mp_stack_anon == NULL)
+ GOTO_ERR(ret, err);
+
+ /* populate an empty mempool */
+ ret = rte_mempool_populate_anon(mp_stack_anon);
+ printf("%s ret = %d\n", __func__, ret);
+ if (ret < 0)
+ GOTO_ERR(ret, err);
+
+ /* Try to populate when already populated */
+ ret = rte_mempool_populate_anon(mp_stack_anon);
+ if (ret != 0)
+ GOTO_ERR(ret, err);
+
+ /* create a mempool */
+ mp_stack_mempool_iter = rte_mempool_create("test_iter_obj",
+ MEMPOOL_SIZE,
+ MEMPOOL_ELT_SIZE,
+ RTE_MEMPOOL_CACHE_MAX_SIZE, 0,
+ NULL, NULL,
+ my_obj_init, NULL,
+ SOCKET_ID_ANY, 0);
+
+ if (mp_stack_mempool_iter == NULL)
+ GOTO_ERR(ret, err);
+
+ /* test to initialize mempool objects and memory */
+ nb_objs = rte_mempool_obj_iter(mp_stack_mempool_iter, rte_pktmbuf_init,
+ NULL);
+ if (nb_objs == 0)
+ GOTO_ERR(ret, err);
+
+ nb_mem_chunks = rte_mempool_mem_iter(mp_stack_mempool_iter,
+ test_mp_mem_init, &cb_arg);
+ if (nb_mem_chunks == 0 || cb_arg.ret < 0)
+ GOTO_ERR(ret, err);
+
/* create a mempool with an external handler */
mp_stack = rte_mempool_create_empty("test_stack",
MEMPOOL_SIZE,
@@ -585,6 +657,8 @@ test_mempool(void)
err:
rte_mempool_free(mp_nocache);
rte_mempool_free(mp_cache);
+ rte_mempool_free(mp_stack_anon);
+ rte_mempool_free(mp_stack_mempool_iter);
rte_mempool_free(mp_stack);
rte_mempool_free(default_pool);