[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [RFC PATCH 32/33] job: Add job_yield()
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [RFC PATCH 32/33] job: Add job_yield() |
Date: |
Tue, 24 Apr 2018 17:25:14 +0200 |
This moves block_job_yield() to the Job layer.
Signed-off-by: Kevin Wolf <address@hidden>
---
include/block/blockjob_int.h | 8 --------
include/qemu/job.h | 8 +++++++-
block/backup.c | 2 +-
block/mirror.c | 2 +-
blockjob.c | 16 ----------------
job.c | 18 +++++++++++++++++-
tests/test-blockjob-txn.c | 2 +-
7 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/include/block/blockjob_int.h b/include/block/blockjob_int.h
index 2fdf35a9fd..3f49ba5472 100644
--- a/include/block/blockjob_int.h
+++ b/include/block/blockjob_int.h
@@ -108,14 +108,6 @@ void block_job_user_resume(Job *job);
void block_job_drain(Job *job);
/**
- * block_job_yield:
- * @job: The job that calls the function.
- *
- * Yield the block job coroutine.
- */
-void block_job_yield(BlockJob *job);
-
-/**
* block_job_ratelimit_get_delay:
*
* Calculate and return delay for the next request in ns. See the docuemntation
diff --git a/include/qemu/job.h b/include/qemu/job.h
index 9df0f5560b..1a4d6167e6 100644
--- a/include/qemu/job.h
+++ b/include/qemu/job.h
@@ -332,6 +332,13 @@ void coroutine_fn job_pause_point(Job *job);
/**
* @job: The job that calls the function.
+ *
+ * Yield the job coroutine.
+ */
+void job_yield(Job *job);
+
+/**
+ * @job: The job that calls the function.
* @ns: How many nanoseconds to stop for.
*
* Put the job to sleep (assuming that it wasn't canceled) for @ns
@@ -485,7 +492,6 @@ int job_finish_sync(Job *job, void (*finish)(Job *, Error
**errp), Error **errp)
/* TODO To be removed from the public interface */
void job_state_transition(Job *job, JobStatus s1);
int job_apply_verb(Job *job, JobVerb bv, Error **errp);
-void coroutine_fn job_do_yield(Job *job, uint64_t ns);
bool job_should_pause(Job *job);
bool job_started(Job *job);
void job_enter_cond(Job *job, bool(*fn)(Job *job));
diff --git a/block/backup.c b/block/backup.c
index ecc1e9164c..3436a87a8e 100644
--- a/block/backup.c
+++ b/block/backup.c
@@ -444,7 +444,7 @@ static void coroutine_fn backup_run(void *opaque)
while (!job_is_cancelled(&job->common.job)) {
/* Yield until the job is cancelled. We just let our before_write
* notify callback service CoW requests. */
- block_job_yield(&job->common);
+ job_yield(&job->common.job);
}
} else if (job->sync_mode == MIRROR_SYNC_MODE_INCREMENTAL) {
ret = backup_run_incremental(job);
diff --git a/block/mirror.c b/block/mirror.c
index b722a407e1..669aca227d 100644
--- a/block/mirror.c
+++ b/block/mirror.c
@@ -731,7 +731,7 @@ static void coroutine_fn mirror_run(void *opaque)
block_job_event_ready(&s->common);
s->synced = true;
while (!job_is_cancelled(&s->common.job) && !s->should_complete) {
- block_job_yield(&s->common);
+ job_yield(&s->common.job);
}
s->common.job.cancelled = false;
goto immediate_exit;
diff --git a/blockjob.c b/blockjob.c
index 0cbe655c0e..6569624691 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -431,22 +431,6 @@ void *block_job_create(const char *job_id, const
BlockJobDriver *driver,
return job;
}
-void block_job_yield(BlockJob *job)
-{
- assert(job->job.busy);
-
- /* Check cancellation *before* setting busy = false, too! */
- if (job_is_cancelled(&job->job)) {
- return;
- }
-
- if (!job_should_pause(&job->job)) {
- job_do_yield(&job->job, -1);
- }
-
- job_pause_point(&job->job);
-}
-
void block_job_iostatus_reset(BlockJob *job)
{
if (job->iostatus == BLOCK_DEVICE_IO_STATUS_OK) {
diff --git a/job.c b/job.c
index 20c901f7a9..5bc98b9794 100644
--- a/job.c
+++ b/job.c
@@ -405,7 +405,7 @@ void job_enter(Job *job)
*
* If @ns is (uint64_t) -1, no timer is scheduled and block_job_enter() must be
* called explicitly. */
-void coroutine_fn job_do_yield(Job *job, uint64_t ns)
+static void coroutine_fn job_do_yield(Job *job, uint64_t ns)
{
job_lock();
if (ns != -1) {
@@ -450,6 +450,22 @@ void coroutine_fn job_pause_point(Job *job)
}
}
+void job_yield(Job *job)
+{
+ assert(job->busy);
+
+ /* Check cancellation *before* setting busy = false, too! */
+ if (job_is_cancelled(job)) {
+ return;
+ }
+
+ if (!job_should_pause(job)) {
+ job_do_yield(job, -1);
+ }
+
+ job_pause_point(job);
+}
+
void coroutine_fn job_sleep_ns(Job *job, int64_t ns)
{
assert(job->busy);
diff --git a/tests/test-blockjob-txn.c b/tests/test-blockjob-txn.c
index 34ee179574..fce836639a 100644
--- a/tests/test-blockjob-txn.c
+++ b/tests/test-blockjob-txn.c
@@ -47,7 +47,7 @@ static void coroutine_fn test_block_job_run(void *opaque)
if (s->use_timer) {
job_sleep_ns(&job->job, 0);
} else {
- block_job_yield(job);
+ job_yield(&job->job);
}
if (job_is_cancelled(&job->job)) {
--
2.13.6
- [Qemu-block] [RFC PATCH 23/33] job: Add job_event_*(), (continued)
- [Qemu-block] [RFC PATCH 23/33] job: Add job_event_*(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 19/33] job: Move pause/resume functions to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 17/33] job: Move coroutine and related code to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 21/33] job: Move BlockJobCreateFlags to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 25/33] job: Convert block_job_cancel_async() to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 28/33] job: Move job_finish_sync() to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 26/33] job: Add job_drain(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 24/33] job: Move single job finalisation to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 27/33] job: Move .complete callback to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 31/33] job: Move completion and cancellation to Job, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 32/33] job: Add job_yield(),
Kevin Wolf <=
- [Qemu-block] [RFC PATCH 29/33] job: Switch transactions to JobTxn, Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 33/33] job: Add job_dismiss(), Kevin Wolf, 2018/04/24
- [Qemu-block] [RFC PATCH 30/33] job: Move transactions to Job, Kevin Wolf, 2018/04/24
- Re: [Qemu-block] [Qemu-devel] [RFC PATCH 00/33] Generic background jobs, no-reply, 2018/04/24
- Re: [Qemu-block] [Qemu-devel] [RFC PATCH 00/33] Generic background jobs, Eric Blake, 2018/04/24