[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v4 04/19] job.c: move inner aiocontext lock in callbacks
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v4 04/19] job.c: move inner aiocontext lock in callbacks |
Date: |
Fri, 28 Jan 2022 06:50:16 -0500 |
Instead of having the lock in job_tnx_apply, move it inside
in the callback. This will be helpful for next commits, when
we introduce job_lock/unlock pairs.
job_transition_to_pending() and job_needs_finalize() do not
need to be protected by the aiocontext lock.
No functional change intended.
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
---
job.c | 17 ++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)
diff --git a/job.c b/job.c
index e97b159396..2b88cef19d 100644
--- a/job.c
+++ b/job.c
@@ -149,7 +149,6 @@ static void job_txn_del_job(Job *job)
static int job_txn_apply(Job *job, int fn(Job *))
{
- AioContext *inner_ctx;
Job *other_job, *next;
JobTxn *txn = job->txn;
int rc = 0;
@@ -164,10 +163,7 @@ static int job_txn_apply(Job *job, int fn(Job *))
aio_context_release(job->aio_context);
QLIST_FOREACH_SAFE(other_job, &txn->jobs, txn_list, next) {
- inner_ctx = other_job->aio_context;
- aio_context_acquire(inner_ctx);
rc = fn(other_job);
- aio_context_release(inner_ctx);
if (rc) {
break;
}
@@ -719,11 +715,15 @@ static void job_clean(Job *job)
static int job_finalize_single(Job *job)
{
+ AioContext *ctx = job->aio_context;
+
assert(job_is_completed(job));
/* Ensure abort is called for late-transactional failures */
job_update_rc(job);
+ aio_context_acquire(ctx);
+
if (!job->ret) {
job_commit(job);
} else {
@@ -731,6 +731,8 @@ static int job_finalize_single(Job *job)
}
job_clean(job);
+ aio_context_release(ctx);
+
if (job->cb) {
job->cb(job->opaque, job->ret);
}
@@ -835,8 +837,8 @@ static void job_completed_txn_abort(Job *job)
assert(job_cancel_requested(other_job));
job_finish_sync(other_job, NULL, NULL);
}
- job_finalize_single(other_job);
aio_context_release(ctx);
+ job_finalize_single(other_job);
}
/*
@@ -851,11 +853,16 @@ static void job_completed_txn_abort(Job *job)
static int job_prepare(Job *job)
{
+ AioContext *ctx = job->aio_context;
assert(qemu_in_main_thread());
+
if (job->ret == 0 && job->driver->prepare) {
+ aio_context_acquire(ctx);
job->ret = job->driver->prepare(job);
+ aio_context_release(ctx);
job_update_rc(job);
}
+
return job->ret;
}
--
2.31.1
- [PATCH v4 00/19] job: replace AioContext lock with job_mutex, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 01/19] job.c: make job_mutex and job_lock/unlock() public, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 02/19] job.h: categorize fields in struct Job, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 04/19] job.c: move inner aiocontext lock in callbacks,
Emanuele Giuseppe Esposito <=
- [PATCH v4 03/19] job.c: make job_event_* functions static, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 05/19] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 07/19] jobs: protect jobs with job_lock/unlock, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 14/19] blockjob: block_job_get_aio_context is a GS function, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 06/19] jobs: remove aiocontext locks since the functions are under BQL, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 09/19] jobs: use job locks also in the unit tests, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 16/19] job: detect change of aiocontext within job coroutine, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 12/19] job.h: define unlocked functions, Emanuele Giuseppe Esposito, 2022/01/28
- [PATCH v4 17/19] jobs: protect job.aio_context with BQL and job_mutex, Emanuele Giuseppe Esposito, 2022/01/28