doc: add Meson coding style to contributors guide

[dpdk.git] / lib / librte_mempool / rte_mempool_ops.c

diff --git a/lib/librte_mempool/rte_mempool_ops.c b/lib/librte_mempool/rte_mempool_ops.c
index 26908cc..5e22667 100644 (file)
--- a/lib/librte_mempool/rte_mempool_ops.c
+++ b/lib/librte_mempool/rte_mempool_ops.c
@@ -6,10 +6,13 @@
 #include <stdio.h>
 #include <string.h>
 
+#include <rte_string_fns.h>
 #include <rte_mempool.h>
 #include <rte_errno.h>
 #include <rte_dev.h>
 
+#include "rte_mempool_trace.h"
+
 /* indirect jump table to support external memory pools. */
 struct rte_mempool_ops_table rte_mempool_ops_table = {
        .sl =  RTE_SPINLOCK_INITIALIZER,
@@ -51,15 +54,16 @@ rte_mempool_register_ops(const struct rte_mempool_ops *h)
 
        ops_index = rte_mempool_ops_table.num_ops++;
        ops = &rte_mempool_ops_table.ops[ops_index];
-       snprintf(ops->name, sizeof(ops->name), "%s", h->name);
+       strlcpy(ops->name, h->name, sizeof(ops->name));
        ops->alloc = h->alloc;
        ops->free = h->free;
        ops->enqueue = h->enqueue;
        ops->dequeue = h->dequeue;
        ops->get_count = h->get_count;
-       ops->get_capabilities = h->get_capabilities;
-       ops->register_memory_area = h->register_memory_area;
        ops->calc_mem_size = h->calc_mem_size;
+       ops->populate = h->populate;
+       ops->get_info = h->get_info;
+       ops->dequeue_contig_blocks = h->dequeue_contig_blocks;
 
        rte_spinlock_unlock(&rte_mempool_ops_table.sl);
 
@@ -72,6 +76,7 @@ rte_mempool_ops_alloc(struct rte_mempool *mp)
 {
        struct rte_mempool_ops *ops;
 
+       rte_mempool_trace_ops_alloc(mp);
        ops = rte_mempool_get_ops(mp->ops_index);
        return ops->alloc(mp);
 }
@@ -82,6 +87,7 @@ rte_mempool_ops_free(struct rte_mempool *mp)
 {
        struct rte_mempool_ops *ops;
 
+       rte_mempool_trace_ops_free(mp);
        ops = rte_mempool_get_ops(mp->ops_index);
        if (ops->free == NULL)
                return;
@@ -98,49 +104,61 @@ rte_mempool_ops_get_count(const struct rte_mempool *mp)
        return ops->get_count(mp);
 }
 
-/* wrapper to get external mempool capabilities. */
-int
-rte_mempool_ops_get_capabilities(const struct rte_mempool *mp,
-                                       unsigned int *flags)
+/* wrapper to calculate the memory size required to store given number
+ * of objects
+ */
+ssize_t
+rte_mempool_ops_calc_mem_size(const struct rte_mempool *mp,
+                               uint32_t obj_num, uint32_t pg_shift,
+                               size_t *min_chunk_size, size_t *align)
 {
        struct rte_mempool_ops *ops;
 
        ops = rte_mempool_get_ops(mp->ops_index);
 
-       RTE_FUNC_PTR_OR_ERR_RET(ops->get_capabilities, -ENOTSUP);
-       return ops->get_capabilities(mp, flags);
+       if (ops->calc_mem_size == NULL)
+               return rte_mempool_op_calc_mem_size_default(mp, obj_num,
+                               pg_shift, min_chunk_size, align);
+
+       return ops->calc_mem_size(mp, obj_num, pg_shift, min_chunk_size, align);
 }
 
-/* wrapper to notify new memory area to external mempool */
+/* wrapper to populate memory pool objects using provided memory chunk */
 int
-rte_mempool_ops_register_memory_area(const struct rte_mempool *mp, char *vaddr,
-                                       rte_iova_t iova, size_t len)
+rte_mempool_ops_populate(struct rte_mempool *mp, unsigned int max_objs,
+                               void *vaddr, rte_iova_t iova, size_t len,
+                               rte_mempool_populate_obj_cb_t *obj_cb,
+                               void *obj_cb_arg)
 {
        struct rte_mempool_ops *ops;
 
        ops = rte_mempool_get_ops(mp->ops_index);
 
-       RTE_FUNC_PTR_OR_ERR_RET(ops->register_memory_area, -ENOTSUP);
-       return ops->register_memory_area(mp, vaddr, iova, len);
+       rte_mempool_trace_ops_populate(mp, max_objs, vaddr, iova, len, obj_cb,
+               obj_cb_arg);
+       if (ops->populate == NULL)
+               return rte_mempool_op_populate_default(mp, max_objs, vaddr,
+                                                      iova, len, obj_cb,
+                                                      obj_cb_arg);
+
+       return ops->populate(mp, max_objs, vaddr, iova, len, obj_cb,
+                            obj_cb_arg);
 }
 
-/* wrapper to notify new memory area to external mempool */
-ssize_t
-rte_mempool_ops_calc_mem_size(const struct rte_mempool *mp,
-                               uint32_t obj_num, uint32_t pg_shift,
-                               size_t *min_chunk_size, size_t *align)
+/* wrapper to get additional mempool info */
+int
+rte_mempool_ops_get_info(const struct rte_mempool *mp,
+                        struct rte_mempool_info *info)
 {
        struct rte_mempool_ops *ops;
 
        ops = rte_mempool_get_ops(mp->ops_index);
 
-       if (ops->calc_mem_size == NULL)
-               return rte_mempool_op_calc_mem_size_default(mp, obj_num,
-                               pg_shift, min_chunk_size, align);
-
-       return ops->calc_mem_size(mp, obj_num, pg_shift, min_chunk_size, align);
+       RTE_FUNC_PTR_OR_ERR_RET(ops->get_info, -ENOTSUP);
+       return ops->get_info(mp, info);
 }
 
+
 /* sets mempool ops previously registered by rte_mempool_register_ops. */
 int
 rte_mempool_set_ops_byname(struct rte_mempool *mp, const char *name,
@@ -166,5 +184,6 @@ rte_mempool_set_ops_byname(struct rte_mempool *mp, const char *name,
 
        mp->ops_index = i;
        mp->pool_config = pool_config;
+       rte_mempool_trace_set_ops_byname(mp, name, pool_config);
        return 0;
 }