From 019bffab5155a69c420917ac381b60afb2c39c4b Mon Sep 17 00:00:00 2001 From: Feifei Wang Date: Thu, 9 Jul 2020 01:12:11 -0500 Subject: [PATCH] ring: remove experimental flag from custom element API Remove the experimental tag for rte_ring_xxx_elem APIs that have been around for 2 releases. Signed-off-by: Feifei Wang Reviewed-by: Honnappa Nagarahalli Reviewed-by: Ruifeng Wang Acked-by: Konstantin Ananyev --- lib/librte_ring/rte_ring.h | 5 +---- lib/librte_ring/rte_ring_elem.h | 8 -------- lib/librte_ring/rte_ring_version.map | 10 ++-------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/lib/librte_ring/rte_ring.h b/lib/librte_ring/rte_ring.h index 7181c33b40..35f3f8c423 100644 --- a/lib/librte_ring/rte_ring.h +++ b/lib/librte_ring/rte_ring.h @@ -40,6 +40,7 @@ extern "C" { #endif #include +#include /** * Calculate the memory size needed for a ring @@ -401,10 +402,6 @@ rte_ring_sp_enqueue_bulk(struct rte_ring *r, void * const *obj_table, RTE_RING_SYNC_ST, free_space); } -#ifdef ALLOW_EXPERIMENTAL_API -#include -#endif - /** * Enqueue several objects on a ring. * diff --git a/lib/librte_ring/rte_ring_elem.h b/lib/librte_ring/rte_ring_elem.h index 9e5192ae6e..69dc51746c 100644 --- a/lib/librte_ring/rte_ring_elem.h +++ b/lib/librte_ring/rte_ring_elem.h @@ -23,9 +23,6 @@ extern "C" { #include /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * Calculate the memory size needed for a ring with given element size * * This function returns the number of bytes needed for a ring, given @@ -43,13 +40,9 @@ extern "C" { * - -EINVAL - esize is not a multiple of 4 or count provided is not a * power of 2. */ -__rte_experimental ssize_t rte_ring_get_memsize_elem(unsigned int esize, unsigned int count); /** - * @warning - * @b EXPERIMENTAL: this API may change without prior notice - * * Create a new ring named *name* that stores elements with given size. * * This function uses ``memzone_reserve()`` to allocate memory. Then it @@ -109,7 +102,6 @@ ssize_t rte_ring_get_memsize_elem(unsigned int esize, unsigned int count); * - EEXIST - a memzone with the same name already exists * - ENOMEM - no appropriate memory area found in which to create memzone */ -__rte_experimental struct rte_ring *rte_ring_create_elem(const char *name, unsigned int esize, unsigned int count, int socket_id, unsigned int flags); diff --git a/lib/librte_ring/rte_ring_version.map b/lib/librte_ring/rte_ring_version.map index 9a6ce4d322..ac392f3ca9 100644 --- a/lib/librte_ring/rte_ring_version.map +++ b/lib/librte_ring/rte_ring_version.map @@ -15,13 +15,7 @@ DPDK_20.0 { DPDK_21 { global: - rte_ring_reset; -} DPDK_20.0; - -EXPERIMENTAL { - global: - - # added in 20.02 rte_ring_create_elem; rte_ring_get_memsize_elem; -}; + rte_ring_reset; +} DPDK_20.0; -- 2.20.1