[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 30/46] job: Move job_finish_sync() to Job
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 30/46] job: Move job_finish_sync() to Job |
Date: |
Wed, 23 May 2018 15:11:39 +0200 |
block_job_finish_sync() doesn't contain anything block job specific any
more, so it can be moved to Job.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
include/qemu/job.h | 9 +++++++++
block/commit.c | 6 +++---
blockjob.c | 55 +++++++++---------------------------------------------
job.c | 28 +++++++++++++++++++++++++++
4 files changed, 49 insertions(+), 49 deletions(-)
diff --git a/include/qemu/job.h b/include/qemu/job.h
index 8f7f71a9b1..17e2ceca87 100644
--- a/include/qemu/job.h
+++ b/include/qemu/job.h
@@ -389,6 +389,15 @@ typedef void JobDeferToMainLoopFn(Job *job, void *opaque);
*/
void job_defer_to_main_loop(Job *job, JobDeferToMainLoopFn *fn, void *opaque);
+/**
+ * Synchronously finishes the given @job. If @finish is given, it is called to
+ * trigger completion or cancellation of the job.
+ *
+ * Returns 0 if the job is successfully completed, -ECANCELED if the job was
+ * cancelled before completing, and -errno in other error cases.
+ */
+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);
void coroutine_fn job_do_yield(Job *job, uint64_t ns);
diff --git a/block/commit.c b/block/commit.c
index 02a8af9127..40d97a35a5 100644
--- a/block/commit.c
+++ b/block/commit.c
@@ -112,9 +112,9 @@ static void commit_complete(Job *job, void *opaque)
blk_unref(s->top);
/* If there is more than one reference to the job (e.g. if called from
- * block_job_finish_sync()), block_job_completed() won't free it and
- * therefore the blockers on the intermediate nodes remain. This would
- * cause bdrv_set_backing_hd() to fail. */
+ * job_finish_sync()), block_job_completed() won't free it and therefore
+ * the blockers on the intermediate nodes remain. This would cause
+ * bdrv_set_backing_hd() to fail. */
block_job_remove_all_bdrv(bjob);
block_job_completed(&s->common, ret);
diff --git a/blockjob.c b/blockjob.c
index 0ca7672941..1ed3e9c88d 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -307,40 +307,6 @@ static int block_job_txn_apply(BlockJobTxn *txn, int
fn(BlockJob *), bool lock)
return rc;
}
-static int block_job_finish_sync(BlockJob *job,
- void (*finish)(BlockJob *, Error **errp),
- Error **errp)
-{
- Error *local_err = NULL;
- int ret;
-
- assert(blk_bs(job->blk)->job == job);
-
- job_ref(&job->job);
-
- if (finish) {
- finish(job, &local_err);
- }
- if (local_err) {
- error_propagate(errp, local_err);
- job_unref(&job->job);
- return -EBUSY;
- }
- /* job_drain calls job_enter, and it should be enough to induce progress
- * until the job completes or moves to the main thread.
- */
- while (!job->job.deferred_to_main_loop && !job_is_completed(&job->job)) {
- job_drain(&job->job);
- }
- while (!job_is_completed(&job->job)) {
- aio_poll(qemu_get_aio_context(), true);
- }
- ret = (job_is_cancelled(&job->job) && job->job.ret == 0)
- ? -ECANCELED : job->job.ret;
- job_unref(&job->job);
- return ret;
-}
-
static void block_job_completed_txn_abort(BlockJob *job)
{
AioContext *ctx;
@@ -375,7 +341,7 @@ static void block_job_completed_txn_abort(BlockJob *job)
ctx = blk_get_aio_context(other_job->blk);
if (!job_is_completed(&other_job->job)) {
assert(job_is_cancelled(&other_job->job));
- block_job_finish_sync(other_job, NULL, NULL);
+ job_finish_sync(&other_job->job, NULL, NULL);
}
job_finalize_single(&other_job->job);
aio_context_release(ctx);
@@ -528,16 +494,18 @@ void block_job_user_cancel(BlockJob *job, bool force,
Error **errp)
}
/* A wrapper around block_job_cancel() taking an Error ** parameter so it may
be
- * used with block_job_finish_sync() without the need for (rather nasty)
- * function pointer casts there. */
-static void block_job_cancel_err(BlockJob *job, Error **errp)
+ * used with job_finish_sync() without the need for (rather nasty) function
+ * pointer casts there. */
+static void block_job_cancel_err(Job *job, Error **errp)
{
- block_job_cancel(job, false);
+ BlockJob *bjob = container_of(job, BlockJob, job);
+ assert(is_block_job(job));
+ block_job_cancel(bjob, false);
}
int block_job_cancel_sync(BlockJob *job)
{
- return block_job_finish_sync(job, &block_job_cancel_err, NULL);
+ return job_finish_sync(&job->job, &block_job_cancel_err, NULL);
}
void block_job_cancel_sync_all(void)
@@ -553,14 +521,9 @@ void block_job_cancel_sync_all(void)
}
}
-static void block_job_complete(BlockJob *job, Error **errp)
-{
- job_complete(&job->job, errp);
-}
-
int block_job_complete_sync(BlockJob *job, Error **errp)
{
- return block_job_finish_sync(job, &block_job_complete, errp);
+ return job_finish_sync(&job->job, job_complete, errp);
}
void block_job_progress_update(BlockJob *job, uint64_t done)
diff --git a/job.c b/job.c
index 8ceac0b01e..aa74b4c03b 100644
--- a/job.c
+++ b/job.c
@@ -603,3 +603,31 @@ void job_defer_to_main_loop(Job *job, JobDeferToMainLoopFn
*fn, void *opaque)
aio_bh_schedule_oneshot(qemu_get_aio_context(),
job_defer_to_main_loop_bh, data);
}
+
+int job_finish_sync(Job *job, void (*finish)(Job *, Error **errp), Error
**errp)
+{
+ Error *local_err = NULL;
+ int ret;
+
+ job_ref(job);
+
+ if (finish) {
+ finish(job, &local_err);
+ }
+ if (local_err) {
+ error_propagate(errp, local_err);
+ job_unref(job);
+ return -EBUSY;
+ }
+ /* job_drain calls job_enter, and it should be enough to induce progress
+ * until the job completes or moves to the main thread. */
+ while (!job->deferred_to_main_loop && !job_is_completed(job)) {
+ job_drain(job);
+ }
+ while (!job_is_completed(job)) {
+ aio_poll(qemu_get_aio_context(), true);
+ }
+ ret = (job_is_cancelled(job) && job->ret == 0) ? -ECANCELED : job->ret;
+ job_unref(job);
+ return ret;
+}
--
2.13.6
- [Qemu-devel] [PULL 23/46] job: Move BlockJobCreateFlags to Job, (continued)
- [Qemu-devel] [PULL 23/46] job: Move BlockJobCreateFlags to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 22/46] job: Replace BlockJob.completed with job_is_completed(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 27/46] job: Convert block_job_cancel_async() to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 16/46] job: Move cancelled to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 20/46] job: Add job_sleep_ns(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 19/46] job: Move coroutine and related code to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 38/46] job: Add job_transition_to_ready(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 26/46] job: Move single job finalisation to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 25/46] job: Add job_event_*(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 34/46] block: Cancel job in bdrv_close_all() callers, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 30/46] job: Move job_finish_sync() to Job,
Kevin Wolf <=
- [Qemu-devel] [PULL 37/46] job: Add job_is_ready(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 39/46] job: Move progress fields to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 33/46] job: Move completion and cancellation to Job, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 36/46] job: Add job_dismiss(), Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 31/46] job: Switch transactions to JobTxn, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 43/46] job: Add query-jobs QMP command, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 44/46] blockjob: Remove BlockJob.driver, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 42/46] job: Add lifecycle QMP commands, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 45/46] iotests: Move qmp_to_opts() to VM, Kevin Wolf, 2018/05/23
- [Qemu-devel] [PULL 35/46] job: Add job_yield(), Kevin Wolf, 2018/05/23