d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

mempool: remove deprecated get and put functions

Browse Source 
As announced in the deprecation notice, remove the functions for
single/multi producer/consumer enqueue/dequeue.

Signed-off-by: Olivier Matz <olivier.matz@6wind.com>
This commit is contained in:
Olivier Matz 2017-02-17 13:28:27 +01:00 committed by Thomas Monjalon
parent f3bc028909
commit 93092a5610
2 changed files with 0 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/guides/rel_notes/deprecation.rst
View File

@ -87,10 +87,6 @@ Deprecation Notices
PKT_RX_QINQ_STRIPPED, that are better described. The old flags and
their behavior will be kept until 17.02 and will be removed in 17.05.
* mempool: The functions for single/multi producer/consumer are deprecated
and will be removed in 17.05.
It is replaced by ``rte_mempool_generic_get/put`` functions.
* ethdev: the legacy filter API, including
``rte_eth_dev_filter_supported()``, ``rte_eth_dev_filter_ctrl()`` as well
as filter types MACVLAN, ETHERTYPE, FLEXIBLE, SYN, NTUPLE, TUNNEL, FDIR,

180
lib/librte_mempool/rte_mempool.h
View File

@ -1107,46 +1107,6 @@ rte_mempool_generic_put(struct rte_mempool *mp, void * const *obj_table,
__mempool_generic_put(mp, obj_table, n, cache);
}
/**
* @deprecated
* Put several objects back in the mempool (multi-producers safe).
*
* @param mp
* A pointer to the mempool structure.
* @param obj_table
* A pointer to a table of void * pointers (objects).
* @param n
* The number of objects to add in the mempool from the obj_table.
*/
__rte_deprecated
static inline void __attribute__((always_inline))
rte_mempool_mp_put_bulk(struct rte_mempool *mp, void * const *obj_table,
unsigned n)
{
struct rte_mempool_cache *cache;
cache = rte_mempool_default_cache(mp, rte_lcore_id());
rte_mempool_generic_put(mp, obj_table, n, cache, 0);
}
/**
* @deprecated
* Put several objects back in the mempool (NOT multi-producers safe).
*
* @param mp
* A pointer to the mempool structure.
* @param obj_table
* A pointer to a table of void * pointers (objects).
* @param n
* The number of objects to add in the mempool from obj_table.
*/
__rte_deprecated
static inline void __attribute__((always_inline))
rte_mempool_sp_put_bulk(struct rte_mempool *mp, void * const *obj_table,
unsigned n)
{
rte_mempool_generic_put(mp, obj_table, n, NULL, MEMPOOL_F_SP_PUT);
}
/**
* Put several objects back in the mempool.
*
@ -1170,40 +1130,6 @@ rte_mempool_put_bulk(struct rte_mempool *mp, void * const *obj_table,
rte_mempool_generic_put(mp, obj_table, n, cache, mp->flags);
}
/**
* @deprecated
* Put one object in the mempool (multi-producers safe).
*
* @param mp
* A pointer to the mempool structure.
* @param obj
* A pointer to the object to be added.
*/
__rte_deprecated
static inline void __attribute__((always_inline))
rte_mempool_mp_put(struct rte_mempool *mp, void *obj)
{
struct rte_mempool_cache *cache;
cache = rte_mempool_default_cache(mp, rte_lcore_id());
rte_mempool_generic_put(mp, &obj, 1, cache, 0);
}
/**
* @deprecated
* Put one object back in the mempool (NOT multi-producers safe).
*
* @param mp
* A pointer to the mempool structure.
* @param obj
* A pointer to the object to be added.
*/
__rte_deprecated
static inline void __attribute__((always_inline))
rte_mempool_sp_put(struct rte_mempool *mp, void *obj)
{
rte_mempool_generic_put(mp, &obj, 1, NULL, MEMPOOL_F_SP_PUT);
}
/**
* Put one object back in the mempool.
*
@ -1331,62 +1257,6 @@ rte_mempool_generic_get(struct rte_mempool *mp, void **obj_table, unsigned n,
return ret;
}
/**
* @deprecated
* Get several objects from the mempool (multi-consumers safe).
*
* If cache is enabled, objects will be retrieved first from cache,
* subsequently from the common pool. Note that it can return -ENOENT when
* the local cache and common pool are empty, even if cache from other
* lcores are full.
*
* @param mp
* A pointer to the mempool structure.
* @param obj_table
* A pointer to a table of void * pointers (objects) that will be filled.
* @param n
* The number of objects to get from mempool to obj_table.
* @return
* - 0: Success; objects taken.
* - -ENOENT: Not enough entries in the mempool; no object is retrieved.
*/
__rte_deprecated
static inline int __attribute__((always_inline))
rte_mempool_mc_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned 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, 0);
}
/**
* @deprecated
* Get several objects from the mempool (NOT multi-consumers safe).
*
* If cache is enabled, objects will be retrieved first from cache,
* subsequently from the common pool. Note that it can return -ENOENT when
* the local cache and common pool are empty, even if cache from other
* lcores are full.
*
* @param mp
* A pointer to the mempool structure.
* @param obj_table
* A pointer to a table of void * pointers (objects) that will be filled.
* @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.
*/
__rte_deprecated
static inline int __attribute__((always_inline))
rte_mempool_sc_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned n)
{
return rte_mempool_generic_get(mp, obj_table, n, NULL,
MEMPOOL_F_SC_GET);
}
/**
* Get several objects from the mempool.
*
@ -1417,56 +1287,6 @@ rte_mempool_get_bulk(struct rte_mempool *mp, void **obj_table, unsigned n)
return rte_mempool_generic_get(mp, obj_table, n, cache, mp->flags);
}
/**
* @deprecated
* Get one object from the mempool (multi-consumers safe).
*
* If cache is enabled, objects will be retrieved first from cache,
* subsequently from the common pool. Note that it can return -ENOENT when
* the local cache and common pool are empty, even if cache from other
* lcores are full.
*
* @param mp
* A pointer to the mempool structure.
* @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.
*/
__rte_deprecated
static inline int __attribute__((always_inline))
rte_mempool_mc_get(struct rte_mempool *mp, void **obj_p)
{
struct rte_mempool_cache *cache;
cache = rte_mempool_default_cache(mp, rte_lcore_id());
return rte_mempool_generic_get(mp, obj_p, 1, cache, 0);
}
/**
* @deprecated
* Get one object from the mempool (NOT multi-consumers safe).
*
* If cache is enabled, objects will be retrieved first from cache,
* subsequently from the common pool. Note that it can return -ENOENT when
* the local cache and common pool are empty, even if cache from other
* lcores are full.
*
* @param mp
* A pointer to the mempool structure.
* @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.
*/
__rte_deprecated
static inline int __attribute__((always_inline))
rte_mempool_sc_get(struct rte_mempool *mp, void **obj_p)
{
return rte_mempool_generic_get(mp, obj_p, 1, NULL, MEMPOOL_F_SC_GET);
}
/**
* Get one object from the mempool.
*