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

ut/reduce: remove _vol_get_chunk_map

Browse Source 
Just use the new _reduce_vol_get_chunk_map function from
reduce.c instead.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I90e9b05226155d0e8d5e74322b02c669de9204df

Reviewed-on: https://review.gerrithub.io/c/spdk/spdk/+/449077
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
Reviewed-by: wuzhouhui <wuzhouhui@kingsoft.com>
Reviewed-by: Paul Luse <paul.e.luse@intel.com>
Reviewed-by: Changpeng Liu <changpeng.liu@intel.com>
This commit is contained in:
Jim Harris 2019-03-22 06:24:00 -07:00
parent 3bb1f95570
commit 3c070c97ff
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
test/unit/lib/reduce/reduce.c/reduce_ut.c
View File

@ -574,12 +574,6 @@ _vol_get_chunk_map_index(struct spdk_reduce_vol *vol, uint64_t offset)
return vol->pm_logical_map[logical_map_index]; return vol->pm_logical_map[logical_map_index];
} }
static uint64_t *
_vol_get_chunk_map(struct spdk_reduce_vol *vol, uint64_t chunk_map_index)
{
return &vol->pm_chunk_maps[chunk_map_index * vol->backing_io_units_per_chunk];
}
static void static void
write_cb(void *arg, int reduce_errno) write_cb(void *arg, int reduce_errno)
{ {
@ -601,7 +595,7 @@ _write_maps(uint32_t backing_blocklen)
char buf[16 * 1024]; /* chunk size */ char buf[16 * 1024]; /* chunk size */
uint32_t i; uint32_t i;
uint64_t old_chunk0_map_index, new_chunk0_map_index; uint64_t old_chunk0_map_index, new_chunk0_map_index;
uint64_t *old_chunk0_map, *new_chunk0_map; struct spdk_reduce_chunk_map *old_chunk0_map, *new_chunk0_map;
params.chunk_size = 16 * 1024; params.chunk_size = 16 * 1024;
params.backing_io_unit_size = 4096; params.backing_io_unit_size = 4096;
@ -630,10 +624,11 @@ _write_maps(uint32_t backing_blocklen)
CU_ASSERT(old_chunk0_map_index != REDUCE_EMPTY_MAP_ENTRY); CU_ASSERT(old_chunk0_map_index != REDUCE_EMPTY_MAP_ENTRY);
CU_ASSERT(spdk_bit_array_get(g_vol->allocated_chunk_maps, old_chunk0_map_index) == true); CU_ASSERT(spdk_bit_array_get(g_vol->allocated_chunk_maps, old_chunk0_map_index) == true);
old_chunk0_map = _vol_get_chunk_map(g_vol, old_chunk0_map_index); old_chunk0_map = _reduce_vol_get_chunk_map(g_vol, old_chunk0_map_index);
for (i = 0; i < g_vol->backing_io_units_per_chunk; i++) { for (i = 0; i < g_vol->backing_io_units_per_chunk; i++) {
CU_ASSERT(old_chunk0_map[i] != REDUCE_EMPTY_MAP_ENTRY); CU_ASSERT(old_chunk0_map->io_unit_index[i] != REDUCE_EMPTY_MAP_ENTRY);
CU_ASSERT(spdk_bit_array_get(g_vol->allocated_backing_io_units, old_chunk0_map[i]) == true); CU_ASSERT(spdk_bit_array_get(g_vol->allocated_backing_io_units,
old_chunk0_map->io_unit_index[i]) == true);
} }
g_reduce_errno = -1; g_reduce_errno = -1;
@ -647,13 +642,15 @@ _write_maps(uint32_t backing_blocklen)
CU_ASSERT(spdk_bit_array_get(g_vol->allocated_chunk_maps, old_chunk0_map_index) == false); CU_ASSERT(spdk_bit_array_get(g_vol->allocated_chunk_maps, old_chunk0_map_index) == false);
for (i = 0; i < g_vol->backing_io_units_per_chunk; i++) { for (i = 0; i < g_vol->backing_io_units_per_chunk; i++) {
CU_ASSERT(spdk_bit_array_get(g_vol->allocated_backing_io_units, old_chunk0_map[i]) == false); CU_ASSERT(spdk_bit_array_get(g_vol->allocated_backing_io_units,
old_chunk0_map->io_unit_index[i]) == false);
} }
new_chunk0_map = _vol_get_chunk_map(g_vol, new_chunk0_map_index); new_chunk0_map = _reduce_vol_get_chunk_map(g_vol, new_chunk0_map_index);
for (i = 0; i < g_vol->backing_io_units_per_chunk; i++) { for (i = 0; i < g_vol->backing_io_units_per_chunk; i++) {
CU_ASSERT(new_chunk0_map[i] != REDUCE_EMPTY_MAP_ENTRY); CU_ASSERT(new_chunk0_map->io_unit_index[i] != REDUCE_EMPTY_MAP_ENTRY);
CU_ASSERT(spdk_bit_array_get(g_vol->allocated_backing_io_units, new_chunk0_map[i]) == true); CU_ASSERT(spdk_bit_array_get(g_vol->allocated_backing_io_units,
new_chunk0_map->io_unit_index[i]) == true);
} }
g_reduce_errno = -1; g_reduce_errno = -1;