OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

test-write-threshold: rewrite test_threshold_(not_)trigger tests

Browse Source 
These tests use bdrv_write_threshold_exceeded() API, which is used only
for test (since pre-previous commit). Better is testing real API, which
is used in block.c as well.

So, let's call bdrv_write_threshold_check_write(), and check is
bs->write_threshold_offset cleared or not (it's cleared iff threshold
triggered).

Also we get rid of BdrvTrackedRequest use here. Note, that paranoiac
bdrv_check_request() calls were added in 8b1170012b to protect
BdrvTrackedRequest. Drop them now.

Signed-off-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Reviewed-by: Max Reitz <mreitz@redhat.com>
Message-Id: <20210506090621.11848-4-vsementsov@virtuozzo.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Max Reitz <mreitz@redhat.com>
This commit is contained in:
Vladimir Sementsov-Ogievskiy 2021-05-06 12:06:16 +03:00 committed by Max Reitz
parent ad578c56d5
commit e46354a8ae
1 changed files with 4 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/unit/test-write-threshold.c
View File

@ -55,41 +55,27 @@ static void test_threshold_multi_set_get(void)
static void test_threshold_not_trigger(void) static void test_threshold_not_trigger(void)
{ {
uint64_t amount = 0;
uint64_t threshold = 4 * 1024 * 1024; uint64_t threshold = 4 * 1024 * 1024;
BlockDriverState bs; BlockDriverState bs;
BdrvTrackedRequest req;
memset(&bs, 0, sizeof(bs)); memset(&bs, 0, sizeof(bs));
memset(&req, 0, sizeof(req));
req.offset = 1024;
req.bytes = 1024;
bdrv_check_request(req.offset, req.bytes, &error_abort);
bdrv_write_threshold_set(&bs, threshold); bdrv_write_threshold_set(&bs, threshold);
amount = bdrv_write_threshold_exceeded(&bs, &req); bdrv_write_threshold_check_write(&bs, 1024, 1024);
g_assert_cmpuint(amount, ==, 0); g_assert_cmpuint(bdrv_write_threshold_get(&bs), ==, threshold);
} }
static void test_threshold_trigger(void) static void test_threshold_trigger(void)
{ {
uint64_t amount = 0;
uint64_t threshold = 4 * 1024 * 1024; uint64_t threshold = 4 * 1024 * 1024;
BlockDriverState bs; BlockDriverState bs;
BdrvTrackedRequest req;
memset(&bs, 0, sizeof(bs)); memset(&bs, 0, sizeof(bs));
memset(&req, 0, sizeof(req));
req.offset = (4 * 1024 * 1024) - 1024;
req.bytes = 2 * 1024;
bdrv_check_request(req.offset, req.bytes, &error_abort);
bdrv_write_threshold_set(&bs, threshold); bdrv_write_threshold_set(&bs, threshold);
amount = bdrv_write_threshold_exceeded(&bs, &req); bdrv_write_threshold_check_write(&bs, threshold - 1024, 2 * 1024);
g_assert_cmpuint(amount, >=, 1024); g_assert_cmpuint(bdrv_write_threshold_get(&bs), ==, 0);
} }
typedef struct TestStruct { typedef struct TestStruct {