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

test/mem: remove dependency on EAL internals

Browse Source 
Rather than dereference the mem_config internal structure, we can rely
on the rte_memzone_walk API and count memzones.

Signed-off-by: David Marchand <david.marchand@redhat.com>
Acked-by: Thomas Monjalon <thomas@monjalon.net>
Acked-by: Anatoly Burakov <anatoly.burakov@intel.com>
This commit is contained in:
David Marchand 2019-10-25 15:56:07 +02:00
parent b5fedaedfc
commit ab35397e7a
1 changed files with 31 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
app/test/test_memzone.c
View File

@ -13,12 +13,12 @@
#include <rte_memory.h>
#include <rte_memzone.h>
#include <rte_eal.h>
#include <rte_lcore.h>
#include <rte_common.h>
#include <rte_string_fns.h>
#include <rte_errno.h>
#include <rte_malloc.h>
#include "../../lib/librte_eal/common/malloc_elem.h"
#include "../../lib/librte_eal/common/eal_memcfg.h"
#include "test.h"
@ -927,6 +927,16 @@ test_memzone_free(void)
return 0;
}
static int test_memzones_left;
static int memzone_walk_cnt;
static void memzone_walk_clb(const struct rte_memzone *mz,
void *arg __rte_unused)
{
memzone_walk_cnt++;
if (!strncmp(TEST_MEMZONE_NAME(""), mz->name, RTE_MEMZONE_NAMESIZE))
test_memzones_left++;
}
static int
test_memzone_basic(void)
{
@ -936,8 +946,12 @@ test_memzone_basic(void)
const struct rte_memzone *memzone4;
const struct rte_memzone *mz;
int memzone_cnt_after, memzone_cnt_expected;
int memzone_cnt_before =
rte_eal_get_configuration()->mem_config->memzones.count;
int memzone_cnt_before;
memzone_walk_cnt = 0;
test_memzones_left = 0;
rte_memzone_walk(memzone_walk_clb, NULL);
memzone_cnt_before = memzone_walk_cnt;
memzone1 = rte_memzone_reserve(TEST_MEMZONE_NAME("testzone1"), 100,
SOCKET_ID_ANY, 0);
@ -960,8 +974,10 @@ test_memzone_basic(void)
(memzone1 != NULL) + (memzone2 != NULL) +
(memzone3 != NULL) + (memzone4 != NULL);
memzone_cnt_after =
rte_eal_get_configuration()->mem_config->memzones.count;
memzone_walk_cnt = 0;
test_memzones_left = 0;
rte_memzone_walk(memzone_walk_clb, NULL);
memzone_cnt_after = memzone_walk_cnt;
if (memzone_cnt_after != memzone_cnt_expected)
return -1;
@ -1039,30 +1055,26 @@ test_memzone_basic(void)
return -1;
}
memzone_cnt_after =
rte_eal_get_configuration()->mem_config->memzones.count;
memzone_walk_cnt = 0;
test_memzones_left = 0;
rte_memzone_walk(memzone_walk_clb, NULL);
memzone_cnt_after = memzone_walk_cnt;
if (memzone_cnt_after != memzone_cnt_before)
return -1;
return 0;
}
static int test_memzones_left;
static int memzone_walk_cnt;
static void memzone_walk_clb(const struct rte_memzone *mz,
void *arg __rte_unused)
{
memzone_walk_cnt++;
if (!strncmp(TEST_MEMZONE_NAME(""), mz->name, RTE_MEMZONE_NAMESIZE))
test_memzones_left++;
}
static int
test_memzone(void)
{
/* take note of how many memzones were allocated before running */
int memzone_cnt =
rte_eal_get_configuration()->mem_config->memzones.count;
int memzone_cnt;
memzone_walk_cnt = 0;
test_memzones_left = 0;
rte_memzone_walk(memzone_walk_clb, NULL);
memzone_cnt = memzone_walk_cnt;
printf("test basic memzone API\n");
if (test_memzone_basic() < 0)