ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

blockjob: reorganize block_job_completed_txn_abort 

This splits the part that touches job states from the part that invokes
callbacks.  It will make the code simpler to understand once job states will
be protected by a different mutex than the AioContext lock.

Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-id: 20170508141310.8674-11-pbonzini@redhat.com
Signed-off-by: Jeff Cody <jcody@redhat.com>
This commit is contained in:
Paolo Bonzini 2017-05-08 16:13:09 +02:00 committed by Jeff Cody
parent 7e74a73499
commit 4fb588e95b
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
blockjob.c
View File

@ -300,6 +300,8 @@ void block_job_start(BlockJob *job)
static void block_job_completed_single(BlockJob *job) static void block_job_completed_single(BlockJob *job)
{ {
assert(job->completed);
if (!job->ret) { if (!job->ret) {
if (job->driver->commit) { if (job->driver->commit) {
job->driver->commit(job); job->driver->commit(job);
@ -361,7 +363,9 @@ static int block_job_finish_sync(BlockJob *job,
block_job_ref(job); block_job_ref(job);
if (finish) {
finish(job, &local_err); finish(job, &local_err);
}
if (local_err) { if (local_err) {
error_propagate(errp, local_err); error_propagate(errp, local_err);
block_job_unref(job); block_job_unref(job);
@ -385,7 +389,7 @@ static void block_job_completed_txn_abort(BlockJob *job)
{ {
AioContext *ctx; AioContext *ctx;
BlockJobTxn *txn = job->txn; BlockJobTxn *txn = job->txn;
BlockJob *other_job, *next; BlockJob *other_job;
if (txn->aborting) { if (txn->aborting) {
/* /*
@ -394,29 +398,34 @@ static void block_job_completed_txn_abort(BlockJob *job)
return; return;
} }
txn->aborting = true; txn->aborting = true;
block_job_txn_ref(txn);
/* We are the first failed job. Cancel other jobs. */ /* We are the first failed job. Cancel other jobs. */
QLIST_FOREACH(other_job, &txn->jobs, txn_list) { QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
ctx = blk_get_aio_context(other_job->blk); ctx = blk_get_aio_context(other_job->blk);
aio_context_acquire(ctx); aio_context_acquire(ctx);
} }
QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
if (other_job == job || other_job->completed) { /* Other jobs are effectively cancelled by us, set the status for
/* Other jobs are "effectively" cancelled by us, set the status for
* them; this job, however, may or may not be cancelled, depending * them; this job, however, may or may not be cancelled, depending
* on the caller, so leave it. */ * on the caller, so leave it. */
QLIST_FOREACH(other_job, &txn->jobs, txn_list) {
if (other_job != job) { if (other_job != job) {
block_job_cancel_async(other_job); block_job_cancel_async(other_job);
} }
continue;
} }
block_job_cancel_sync(other_job); while (!QLIST_EMPTY(&txn->jobs)) {
assert(other_job->completed); other_job = QLIST_FIRST(&txn->jobs);
}
QLIST_FOREACH_SAFE(other_job, &txn->jobs, txn_list, next) {
ctx = blk_get_aio_context(other_job->blk); ctx = blk_get_aio_context(other_job->blk);
if (!other_job->completed) {
assert(other_job->cancelled);
block_job_finish_sync(other_job, NULL, NULL);
}
block_job_completed_single(other_job); block_job_completed_single(other_job);
aio_context_release(ctx); aio_context_release(ctx);
} }
block_job_txn_unref(txn);
} }
static void block_job_completed_txn_success(BlockJob *job) static void block_job_completed_txn_success(BlockJob *job)