From: Emanuele Giuseppe Esposito <eesposit@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Hanna Reitz <hreitz@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>, John Snow <jsnow@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>,
Wen Congyang <wencongyang2@huawei.com>,
Xie Changlong <xiechanglong.d@gmail.com>,
Markus Armbruster <armbru@redhat.com>,
Stefan Hajnoczi <stefanha@redhat.com>, Fam Zheng <fam@euphon.net>,
qemu-devel@nongnu.org,
Emanuele Giuseppe Esposito <eesposit@redhat.com>,
Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Subject: [PATCH v12 15/21] blockjob: rename notifier callbacks as _locked
Date: Mon, 26 Sep 2022 05:32:08 -0400 [thread overview]
Message-ID: <20220926093214.506243-16-eesposit@redhat.com> (raw)
In-Reply-To: <20220926093214.506243-1-eesposit@redhat.com>
They all are called with job_lock held, in job_event_*_locked()
Signed-off-by: Emanuele Giuseppe Esposito <eesposit@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@yandex-team.ru>
Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
---
blockjob.c | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/blockjob.c b/blockjob.c
index c8919cef9b..d8fb5311c7 100644
--- a/blockjob.c
+++ b/blockjob.c
@@ -250,7 +250,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();
}
@@ -370,7 +371,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;
@@ -389,7 +391,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;
@@ -415,7 +418,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;
@@ -427,7 +431,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;
@@ -472,11 +477,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
next prev parent reply other threads:[~2022-09-26 9:40 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-09-26 9:31 [PATCH v12 00/21] job: replace AioContext lock with job_mutex Emanuele Giuseppe Esposito
2022-09-26 9:31 ` [PATCH v12 01/21] job.c: make job_mutex and job_lock/unlock() public Emanuele Giuseppe Esposito
2022-09-26 9:31 ` [PATCH v12 02/21] job.h: categorize fields in struct Job Emanuele Giuseppe Esposito
2022-09-26 9:31 ` [PATCH v12 03/21] job.c: API functions not used outside should be static Emanuele Giuseppe Esposito
2022-09-26 9:31 ` [PATCH v12 04/21] aio-wait.h: introduce AIO_WAIT_WHILE_UNLOCKED Emanuele Giuseppe Esposito
2022-09-26 9:31 ` [PATCH v12 05/21] job.c: add job_lock/unlock while keeping job.h intact Emanuele Giuseppe Esposito
2022-09-26 9:31 ` [PATCH v12 06/21] job: move and update comments from blockjob.c Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 07/21] blockjob: introduce block_job _locked() APIs Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 08/21] jobs: add job lock in find_* functions Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 09/21] jobs: use job locks also in the unit tests Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 10/21] block/mirror.c: use of job helpers in drivers Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 11/21] jobs: group together API calls under the same job lock Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 12/21] job: detect change of aiocontext within job coroutine Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 13/21] jobs: protect job.aio_context with BQL and job_mutex Emanuele Giuseppe Esposito
2022-09-26 11:53 ` Vladimir Sementsov-Ogievskiy
2022-09-26 9:32 ` [PATCH v12 14/21] blockjob.h: categorize fields in struct BlockJob Emanuele Giuseppe Esposito
2022-09-26 9:32 ` Emanuele Giuseppe Esposito [this message]
2022-09-26 9:32 ` [PATCH v12 16/21] blockjob: protect iostatus field in BlockJob struct Emanuele Giuseppe Esposito
2022-10-06 16:48 ` Kevin Wolf
2022-09-26 9:32 ` [PATCH v12 17/21] job.h: categorize JobDriver callbacks that need the AioContext lock Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 18/21] job.c: enable job lock/unlock and remove Aiocontext locks Emanuele Giuseppe Esposito
2022-09-26 12:24 ` Vladimir Sementsov-Ogievskiy
2022-09-26 9:32 ` [PATCH v12 19/21] block_job_query: remove atomic read Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 20/21] blockjob: remove unused functions Emanuele Giuseppe Esposito
2022-09-26 9:32 ` [PATCH v12 21/21] job: " Emanuele Giuseppe Esposito
2022-09-26 12:34 ` Vladimir Sementsov-Ogievskiy
2022-10-06 17:42 ` [PATCH v12 00/21] job: replace AioContext lock with job_mutex Kevin Wolf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220926093214.506243-16-eesposit@redhat.com \
--to=eesposit@redhat.com \
--cc=armbru@redhat.com \
--cc=fam@euphon.net \
--cc=hreitz@redhat.com \
--cc=jsnow@redhat.com \
--cc=kwolf@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-block@nongnu.org \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=vsementsov@virtuozzo.com \
--cc=vsementsov@yandex-team.ru \
--cc=wencongyang2@huawei.com \
--cc=xiechanglong.d@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).