test/reduce: test 512 byte backing blocklen
Parameterize the existing unit tests to maximize code reuse. Signed-off-by: Jim Harris <james.r.harris@intel.com> Change-Id: Iaa6b1bd52ad48ad4c19f6e6419e3e669b2d61e56 Reviewed-on: https://review.gerrithub.io/434117 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Chandler-Test-Pool: SPDK Automated Test System <sys_sgsw@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
parent
383b117309
commit
212770db66
@ -308,12 +308,13 @@ backing_dev_destroy(struct spdk_reduce_backing_dev *backing_dev)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
backing_dev_init(struct spdk_reduce_backing_dev *backing_dev, struct spdk_reduce_vol_params *params)
|
backing_dev_init(struct spdk_reduce_backing_dev *backing_dev, struct spdk_reduce_vol_params *params,
|
||||||
|
uint32_t backing_blocklen)
|
||||||
{
|
{
|
||||||
int64_t size;
|
int64_t size;
|
||||||
|
|
||||||
size = spdk_reduce_get_backing_device_size(params);
|
size = spdk_reduce_get_backing_device_size(params);
|
||||||
backing_dev->blocklen = params->backing_io_unit_size;
|
backing_dev->blocklen = backing_blocklen;
|
||||||
backing_dev->blockcnt = size / backing_dev->blocklen;
|
backing_dev->blockcnt = size / backing_dev->blocklen;
|
||||||
backing_dev->readv = backing_dev_readv;
|
backing_dev->readv = backing_dev_readv;
|
||||||
backing_dev->writev = backing_dev_writev;
|
backing_dev->writev = backing_dev_writev;
|
||||||
@ -338,7 +339,7 @@ init_md(void)
|
|||||||
params.backing_io_unit_size = 512;
|
params.backing_io_unit_size = 512;
|
||||||
params.logical_block_size = 512;
|
params.logical_block_size = 512;
|
||||||
|
|
||||||
backing_dev_init(&backing_dev, ¶ms);
|
backing_dev_init(&backing_dev, ¶ms, 512);
|
||||||
|
|
||||||
g_vol = NULL;
|
g_vol = NULL;
|
||||||
g_reduce_errno = -1;
|
g_reduce_errno = -1;
|
||||||
@ -379,7 +380,7 @@ init_md(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
init_backing_dev(void)
|
_init_backing_dev(uint32_t backing_blocklen)
|
||||||
{
|
{
|
||||||
struct spdk_reduce_vol_params params = {};
|
struct spdk_reduce_vol_params params = {};
|
||||||
struct spdk_reduce_vol_params *persistent_params;
|
struct spdk_reduce_vol_params *persistent_params;
|
||||||
@ -391,7 +392,7 @@ init_backing_dev(void)
|
|||||||
params.logical_block_size = 512;
|
params.logical_block_size = 512;
|
||||||
spdk_uuid_generate(¶ms.uuid);
|
spdk_uuid_generate(¶ms.uuid);
|
||||||
|
|
||||||
backing_dev_init(&backing_dev, ¶ms);
|
backing_dev_init(&backing_dev, ¶ms, backing_blocklen);
|
||||||
|
|
||||||
g_vol = NULL;
|
g_vol = NULL;
|
||||||
g_path = NULL;
|
g_path = NULL;
|
||||||
@ -423,7 +424,14 @@ init_backing_dev(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
load(void)
|
init_backing_dev(void)
|
||||||
|
{
|
||||||
|
_init_backing_dev(512);
|
||||||
|
_init_backing_dev(4096);
|
||||||
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
_load(uint32_t backing_blocklen)
|
||||||
{
|
{
|
||||||
struct spdk_reduce_vol_params params = {};
|
struct spdk_reduce_vol_params params = {};
|
||||||
struct spdk_reduce_backing_dev backing_dev = {};
|
struct spdk_reduce_backing_dev backing_dev = {};
|
||||||
@ -435,7 +443,7 @@ load(void)
|
|||||||
params.logical_block_size = 512;
|
params.logical_block_size = 512;
|
||||||
spdk_uuid_generate(¶ms.uuid);
|
spdk_uuid_generate(¶ms.uuid);
|
||||||
|
|
||||||
backing_dev_init(&backing_dev, ¶ms);
|
backing_dev_init(&backing_dev, ¶ms, backing_blocklen);
|
||||||
|
|
||||||
g_vol = NULL;
|
g_vol = NULL;
|
||||||
g_reduce_errno = -1;
|
g_reduce_errno = -1;
|
||||||
@ -469,6 +477,13 @@ load(void)
|
|||||||
backing_dev_destroy(&backing_dev);
|
backing_dev_destroy(&backing_dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
load(void)
|
||||||
|
{
|
||||||
|
_load(512);
|
||||||
|
_load(4096);
|
||||||
|
}
|
||||||
|
|
||||||
static uint64_t
|
static uint64_t
|
||||||
_vol_get_chunk_map_index(struct spdk_reduce_vol *vol, uint64_t offset)
|
_vol_get_chunk_map_index(struct spdk_reduce_vol *vol, uint64_t offset)
|
||||||
{
|
{
|
||||||
@ -496,7 +511,7 @@ read_cb(void *arg, int reduce_errno)
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
write_maps(void)
|
_write_maps(uint32_t backing_blocklen)
|
||||||
{
|
{
|
||||||
struct spdk_reduce_vol_params params = {};
|
struct spdk_reduce_vol_params params = {};
|
||||||
struct spdk_reduce_backing_dev backing_dev = {};
|
struct spdk_reduce_backing_dev backing_dev = {};
|
||||||
@ -512,7 +527,7 @@ write_maps(void)
|
|||||||
params.logical_block_size = 512;
|
params.logical_block_size = 512;
|
||||||
spdk_uuid_generate(¶ms.uuid);
|
spdk_uuid_generate(¶ms.uuid);
|
||||||
|
|
||||||
backing_dev_init(&backing_dev, ¶ms);
|
backing_dev_init(&backing_dev, ¶ms, backing_blocklen);
|
||||||
|
|
||||||
g_vol = NULL;
|
g_vol = NULL;
|
||||||
g_reduce_errno = -1;
|
g_reduce_errno = -1;
|
||||||
@ -581,9 +596,15 @@ write_maps(void)
|
|||||||
backing_dev_destroy(&backing_dev);
|
backing_dev_destroy(&backing_dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
write_maps(void)
|
||||||
|
{
|
||||||
|
_write_maps(512);
|
||||||
|
_write_maps(4096);
|
||||||
|
}
|
||||||
|
|
||||||
static void
|
static void
|
||||||
read_write(void)
|
_read_write(uint32_t backing_blocklen)
|
||||||
{
|
{
|
||||||
struct spdk_reduce_vol_params params = {};
|
struct spdk_reduce_vol_params params = {};
|
||||||
struct spdk_reduce_backing_dev backing_dev = {};
|
struct spdk_reduce_backing_dev backing_dev = {};
|
||||||
@ -598,7 +619,7 @@ read_write(void)
|
|||||||
params.logical_block_size = 512;
|
params.logical_block_size = 512;
|
||||||
spdk_uuid_generate(¶ms.uuid);
|
spdk_uuid_generate(¶ms.uuid);
|
||||||
|
|
||||||
backing_dev_init(&backing_dev, ¶ms);
|
backing_dev_init(&backing_dev, ¶ms, backing_blocklen);
|
||||||
|
|
||||||
g_vol = NULL;
|
g_vol = NULL;
|
||||||
g_reduce_errno = -1;
|
g_reduce_errno = -1;
|
||||||
@ -655,6 +676,13 @@ read_write(void)
|
|||||||
backing_dev_destroy(&backing_dev);
|
backing_dev_destroy(&backing_dev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void
|
||||||
|
read_write(void)
|
||||||
|
{
|
||||||
|
_read_write(512);
|
||||||
|
_read_write(4096);
|
||||||
|
}
|
||||||
|
|
||||||
int
|
int
|
||||||
main(int argc, char **argv)
|
main(int argc, char **argv)
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user