motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-08-05 16:53:55 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

job: Move coroutine and related code to Job

Browse source 
This commit moves some core functions for dealing with the job coroutine
from BlockJob to Job. This includes primarily entering the coroutine
(both for the first and reentering) and yielding explicitly and at pause
points.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: John Snow <jsnow@redhat.com>
This commit is contained in:
Kevin Wolf 2018-04-13 17:31:02 +02:00
parent 1908a5590c
commit da01ff7f38
14 changed files with 305 additions and 299 deletions
Download patch file Download diff file Expand all files Collapse all files

38
tests/test-bdrv-drain.c
View file

@ -524,8 +524,8 @@ BlockJobDriver test_job_driver = {
.job_driver = {
.instance_size = sizeof(TestBlockJob),
.free = block_job_free,
.start = test_job_start,
},
.start = test_job_start,
.complete = test_job_complete,
};
@ -549,47 +549,47 @@ static void test_blockjob_common(enum drain_type drain_type)
job = block_job_create("job0", &test_job_driver, NULL, src, 0, BLK_PERM_ALL,
0, 0, NULL, NULL, &error_abort);
block_job_add_bdrv(job, "target", target, 0, BLK_PERM_ALL, &error_abort);
block_job_start(job);
job_start(&job->job);
g_assert_cmpint(job->pause_count, ==, 0);
g_assert_false(job->paused);
g_assert_false(job->busy); /* We're in block_job_sleep_ns() */
g_assert_cmpint(job->job.pause_count, ==, 0);
g_assert_false(job->job.paused);
g_assert_false(job->job.busy); /* We're in block_job_sleep_ns() */
do_drain_begin(drain_type, src);
if (drain_type == BDRV_DRAIN_ALL) {
/* bdrv_drain_all() drains both src and target */
g_assert_cmpint(job->pause_count, ==, 2);
g_assert_cmpint(job->job.pause_count, ==, 2);
} else {
g_assert_cmpint(job->pause_count, ==, 1);
g_assert_cmpint(job->job.pause_count, ==, 1);
}
/* XXX We don't wait until the job is actually paused. Is this okay? */
/* g_assert_true(job->paused); */
g_assert_false(job->busy); /* The job is paused */
/* g_assert_true(job->job.paused); */
g_assert_false(job->job.busy); /* The job is paused */
do_drain_end(drain_type, src);
g_assert_cmpint(job->pause_count, ==, 0);
g_assert_false(job->paused);
g_assert_false(job->busy); /* We're in block_job_sleep_ns() */
g_assert_cmpint(job->job.pause_count, ==, 0);
g_assert_false(job->job.paused);
g_assert_false(job->job.busy); /* We're in block_job_sleep_ns() */
do_drain_begin(drain_type, target);
if (drain_type == BDRV_DRAIN_ALL) {
/* bdrv_drain_all() drains both src and target */
g_assert_cmpint(job->pause_count, ==, 2);
g_assert_cmpint(job->job.pause_count, ==, 2);
} else {
g_assert_cmpint(job->pause_count, ==, 1);
g_assert_cmpint(job->job.pause_count, ==, 1);
}
/* XXX We don't wait until the job is actually paused. Is this okay? */
/* g_assert_true(job->paused); */
g_assert_false(job->busy); /* The job is paused */
/* g_assert_true(job->job.paused); */
g_assert_false(job->job.busy); /* The job is paused */
do_drain_end(drain_type, target);
g_assert_cmpint(job->pause_count, ==, 0);
g_assert_false(job->paused);
g_assert_false(job->busy); /* We're in block_job_sleep_ns() */
g_assert_cmpint(job->job.pause_count, ==, 0);
g_assert_false(job->job.paused);
g_assert_false(job->job.busy); /* We're in block_job_sleep_ns() */
ret = block_job_complete_sync(job, &error_abort);
g_assert_cmpint(ret, ==, 0);