shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

unit-test/bcache-utils: Tweak zero tests

Browse Source
This commit is contained in:
Joe Thornber 2018-05-09 10:50:31 +01:00
parent bc50dc6e70
commit 2e1869b923
1 changed files with 2 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
test/unit/bcache_utils_t.c
View File

@ -102,11 +102,6 @@ static void _verify_bytes(struct block *b, uint64_t base,
T_ASSERT_EQUAL(((uint8_t *) b->data)[offset + i], _pattern_at(pat, base + offset + i)); T_ASSERT_EQUAL(((uint8_t *) b->data)[offset + i], _pattern_at(pat, base + offset + i));
} }
static void _zero_bytes(struct block *b, uint64_t offset, uint64_t len)
{
memset(((uint8_t *) b->data) + offset, 0, len);
}
static uint64_t _min(uint64_t lhs, uint64_t rhs) static uint64_t _min(uint64_t lhs, uint64_t rhs)
{ {
return rhs < lhs ? rhs : lhs; return rhs < lhs ? rhs : lhs;
@ -179,30 +174,13 @@ static void _do_write(struct fixture *f, uint64_t byte_b, uint64_t byte_e, uint8
for (i = 0; i < len; i++) for (i = 0; i < len; i++)
buffer[i] = _pattern_at(pat, byte_b + i); buffer[i] = _pattern_at(pat, byte_b + i);
T_ASSERT(bcache_write_bytes(f->cache, f->fd, byte_b, i, buffer)); T_ASSERT(bcache_write_bytes(f->cache, f->fd, byte_b, byte_e - byte_b, buffer));
free(buffer); free(buffer);
} }
static void _do_zero(struct fixture *f, uint64_t byte_b, uint64_t byte_e) static void _do_zero(struct fixture *f, uint64_t byte_b, uint64_t byte_e)
{ {
int err; T_ASSERT(bcache_zero_bytes(f->cache, f->fd, byte_b, byte_e - byte_b));
struct block *b;
block_address bb = byte_b / T_BLOCK_SIZE;
block_address be = (byte_e + T_BLOCK_SIZE - 1) / T_BLOCK_SIZE;
uint64_t offset = byte_b % T_BLOCK_SIZE;
uint64_t blen, len = byte_e - byte_b;
for (; bb != be; bb++) {
T_ASSERT(bcache_get(f->cache, f->fd, bb, GF_DIRTY, &b, &err));
blen = _min(T_BLOCK_SIZE - offset, len);
_zero_bytes(b, offset, blen);
offset = 0;
len -= blen;
bcache_put(b);
}
} }
static void _reopen(struct fixture *f) static void _reopen(struct fixture *f)