[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v9 18/21] blockjob: rename notifier callbacks as _locked
From: |
Emanuele Giuseppe Esposito |
Subject: |
[PATCH v9 18/21] blockjob: rename notifier callbacks as _locked |
Date: |
Wed, 6 Jul 2022 16:15:30 -0400 |
They all are called with job_lock held, in job_event_*_locked()
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
---
blockjob.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index bbd297b583..a2559b97a7 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -254,7 +254,8 @@ int block_job_add_bdrv(BlockJob *job, const char *name,
BlockDriverState *bs,
return 0;
}
-static void block_job_on_idle(Notifier *n, void *opaque)
+/* Called with job_mutex lock held. */
+static void block_job_on_idle_locked(Notifier *n, void *opaque)
{
aio_wait_kick();
}
@@ -374,7 +375,8 @@ static void block_job_iostatus_set_err(BlockJob *job, int
error)
}
}
-static void block_job_event_cancelled(Notifier *n, void *opaque)
+/* Called with job_mutex lock held. */
+static void block_job_event_cancelled_locked(Notifier *n, void *opaque)
{
BlockJob *job = opaque;
uint64_t progress_current, progress_total;
@@ -393,7 +395,8 @@ static void block_job_event_cancelled(Notifier *n, void
*opaque)
job->speed);
}
-static void block_job_event_completed(Notifier *n, void *opaque)
+/* Called with job_mutex lock held. */
+static void block_job_event_completed_locked(Notifier *n, void *opaque)
{
BlockJob *job = opaque;
const char *msg = NULL;
@@ -419,7 +422,8 @@ static void block_job_event_completed(Notifier *n, void
*opaque)
msg);
}
-static void block_job_event_pending(Notifier *n, void *opaque)
+/* Called with job_mutex lock held. */
+static void block_job_event_pending_locked(Notifier *n, void *opaque)
{
BlockJob *job = opaque;
@@ -431,7 +435,8 @@ static void block_job_event_pending(Notifier *n, void
*opaque)
job->job.id);
}
-static void block_job_event_ready(Notifier *n, void *opaque)
+/* Called with job_mutex lock held. */
+static void block_job_event_ready_locked(Notifier *n, void *opaque)
{
BlockJob *job = opaque;
uint64_t progress_current, progress_total;
@@ -476,11 +481,11 @@ void *block_job_create(const char *job_id, const
BlockJobDriver *driver,
ratelimit_init(&job->limit);
- job->finalize_cancelled_notifier.notify = block_job_event_cancelled;
- job->finalize_completed_notifier.notify = block_job_event_completed;
- job->pending_notifier.notify = block_job_event_pending;
- job->ready_notifier.notify = block_job_event_ready;
- job->idle_notifier.notify = block_job_on_idle;
+ job->finalize_cancelled_notifier.notify = block_job_event_cancelled_locked;
+ job->finalize_completed_notifier.notify = block_job_event_completed_locked;
+ job->pending_notifier.notify = block_job_event_pending_locked;
+ job->ready_notifier.notify = block_job_event_ready_locked;
+ job->idle_notifier.notify = block_job_on_idle_locked;
WITH_JOB_LOCK_GUARD() {
notifier_list_add(&job->job.on_finalize_cancelled,
--
2.31.1
- [PATCH v9 11/21] jobs: group together API calls under the same job lock, (continued)
- [PATCH v9 02/21] job.h: categorize fields in struct Job, Emanuele Giuseppe Esposito, 2022/07/06
- [PATCH v9 16/21] block_job_query: remove atomic read, Emanuele Giuseppe Esposito, 2022/07/06
- [PATCH v9 17/21] blockjob.h: categorize fields in struct BlockJob, Emanuele Giuseppe Esposito, 2022/07/06
- [PATCH v9 18/21] blockjob: rename notifier callbacks as _locked,
Emanuele Giuseppe Esposito <=
- [PATCH v9 21/21] job: remove unused functions, Emanuele Giuseppe Esposito, 2022/07/06
- Re: [PATCH v9 00/21] job: replace AioContext lock with job_mutex, Vladimir Sementsov-Ogievskiy, 2022/07/11