ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iscsi: use new rte_mempool_avail_count() API

Browse Source 
Change-Id: I75fc46181202d6b4732f65079815e1ae34e14cf9
Signed-off-by: Daniel Verkamp <daniel.verkamp@intel.com>
This commit is contained in:
Daniel Verkamp 2016-08-04 14:46:03 -07:00
parent 40c874105e
commit cc0091cf00
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/iscsi/iscsi_subsystem.c
View File

@ -52,6 +52,7 @@
#include <rte_string_fns.h> #include <rte_string_fns.h>
#include <rte_cycles.h> #include <rte_cycles.h>
#include <rte_malloc.h> #include <rte_malloc.h>
#include <rte_version.h>
#include <inttypes.h> #include <inttypes.h>
#include <unistd.h> #include <unistd.h>
@ -458,12 +459,23 @@ spdk_iscsi_initialize_all_pools(void)
return 0; return 0;
} }
/*
* Wrapper to provide rte_mempool_avail_count() on older DPDK versions.
* Drop this if the minimum DPDK version is raised to at least 16.07.
*/
#if RTE_VERSION < RTE_VERSION_NUM(16, 7, 0, 1)
static unsigned rte_mempool_avail_count(const struct rte_mempool *pool)
{
return rte_mempool_count(pool);
}
#endif
static int static int
spdk_iscsi_check_pool(struct rte_mempool *pool, uint32_t count) spdk_iscsi_check_pool(struct rte_mempool *pool, uint32_t count)
{ {
if (rte_mempool_count(pool) != count) { if (rte_mempool_avail_count(pool) != count) {
SPDK_ERRLOG("rte_mempool_count(%s) == %d, should be %d\n", SPDK_ERRLOG("rte_mempool_avail_count(%s) == %d, should be %d\n",
pool->name, rte_mempool_count(pool), count); pool->name, rte_mempool_avail_count(pool), count);
return -1; return -1;
} else { } else {
return 0; return 0;