job: delete job_{lock, unlock} functions and replace them with lock guard
PATCH 1/1 job: delete job_{lock, unlock} functions and replace them with lock guard
--- job.c | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-)
job.c +17 -29
@@ -79,16 +79,6 @@ struct JobTxn {* job_enter. */ static QemuMutex job_mutex; -static void job_lock (void ) -{ -qemu_mutex_lock (&job_mutex); -} - -static void job_unlock (void ) -{ -qemu_mutex_unlock (&job_mutex); -} -static void __attribute__((__constructor__))job_init (void ) {qemu_mutex_init (&job_mutex);
@@ -437,21 +427,19 @@ void job_enter_cond(Job *job, bool(*fn)(Job *job))return ; } -job_lock (); -if (job->busy) { -job_unlock (); -return ; - } + WITH_QEMU_LOCK_GUARD(&job_mutex) { +if (job->busy) { +return ; + } -if (fn && !fn (job)) { -job_unlock (); -return ; - } +if (fn && !fn (job)) { +return ; + } -assert (!job->deferred_to_main_loop); -timer_del (&job->sleep_timer); - job->busy = true; -job_unlock (); +assert (!job->deferred_to_main_loop); +timer_del (&job->sleep_timer); + job->busy = true; + }aio_co_enter (job->aio_context, job->co); }
@@ -468,13 +456,13 @@ void job_enter(Job *job)* called explicitly. */ static void coroutine_fn job_do_yield(Job *job, uint64_t ns) { -job_lock (); -if (ns !=-1 ) { -timer_mod (&job->sleep_timer, ns); + WITH_QEMU_LOCK_GUARD(&job_mutex) { +if (ns !=-1 ) { +timer_mod (&job->sleep_timer, ns); + } + job->busy = false; +job_event_idle (job); } - job->busy = false; -job_event_idle (job); -job_unlock ();qemu_coroutine_yield ();/* Set by job_enter_cond() before re-entering the coroutine. */
Signature · 1 line
2.25.1
Quoted 1 line · Elena Afanasova
Signed-off-by Elena Afanasova <[email protected]>
Hi, can I have a commit message here, please?
Quoted 61 lines
--- job.c | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-)job.c +11
-23@@ -79,16 +79,6 @@ struct JobTxn {* job_enter. */ static QemuMutex job_mutex; -static void job_lock (void ) -{ -qemu_mutex_lock (&job_mutex); -} - -static void job_unlock (void ) -{ -qemu_mutex_unlock (&job_mutex); -} -static void __attribute__((__constructor__))job_init (void ) {qemu_mutex_init (&job_mutex);@@ -437,21 +427,19 @@ void job_enter_cond(Job *job, bool(*fn)(Job *job))return ; } -job_lock (); -if (job->busy) { -job_unlock (); -return ; - } + WITH_QEMU_LOCK_GUARD(&job_mutex) { +if (job->busy) { +return ; + } -if (fn && !fn (job)) { -job_unlock (); -return ; - } +if (fn && !fn (job)) { +return ; + } -assert (!job->deferred_to_main_loop); -timer_del (&job->sleep_timer); - job->busy = true; -job_unlock (); +assert (!job->deferred_to_main_loop); +timer_del (&job->sleep_timer); + job->busy = true; + }aio_co_enter (job->aio_context, job->co); }@@ -468,13 +456,13 @@ void job_enter(Job *job)* called explicitly. */ static void coroutine_fn job_do_yield(Job *job, uint64_t ns)
job.c void job_enter(Job *job) · line 464
Quoted 10 lines
job.c +6
-3{ -job_lock (); -if (ns !=-1 ) { -timer_mod (&job->sleep_timer, ns); + WITH_QEMU_LOCK_GUARD(&job_mutex) { +if (ns !=-1 ) { +timer_mod (&job->sleep_timer, ns); + } + job->busy = false; +job_event_idle (job);
Is this new macro safe to use in a coroutine context?
job.c void job_enter(Job *job) · line 468
Quoted 8 lines
job.c +0
-3} - job->busy = false; -job_event_idle (job); -job_unlock ();qemu_coroutine_yield ();/* Set by job_enter_cond() before re-entering the coroutine. */
I haven't looked into WITH_QEMU_LOCK_GUARD before, I assume it's new. If it works like I think it does, this change seems good.
(I'm assuming it works like a Python context manager and it drops the lock when it leaves the scope of the macro using GCC/Clang language extensions.)
Re: [PATCH] job: delete job_{lock,unlock} functions and replace them with lock guard
Quoted 64 lines · John Snow
Quoted 1 line · Elena Afanasova
Signed-off-by Elena Afanasova <[email protected]>Hi, can I have a commit message here, please?
Quoted 59 lines
--- job.c | 46 +++++++++++++++++----------------------------- 1 file changed, 17 insertions(+), 29 deletions(-)job.c +11
-23@@ -79,16 +79,6 @@ struct JobTxn {* job_enter. */ static QemuMutex job_mutex; -static void job_lock (void ) -{ -qemu_mutex_lock (&job_mutex); -} - -static void job_unlock (void ) -{ -qemu_mutex_unlock (&job_mutex); -} -static void __attribute__((__constructor__))job_init (void ) {qemu_mutex_init (&job_mutex);@@ -437,21 +427,19 @@ void job_enter_cond(Job *job, bool(*fn)(Job *job))return ; } -job_lock (); -if (job->busy) { -job_unlock (); -return ; - } + WITH_QEMU_LOCK_GUARD(&job_mutex) { +if (job->busy) { +return ; + } -if (fn && !fn (job)) { -job_unlock (); -return ; - } +if (fn && !fn (job)) { +return ; + } -assert (!job->deferred_to_main_loop); -timer_del (&job->sleep_timer); - job->busy = true; -job_unlock (); +assert (!job->deferred_to_main_loop); +timer_del (&job->sleep_timer); + job->busy = true; + }aio_co_enter (job->aio_context, job->co); }
Quoted 15 lines
job.c void job_enter(Job *job) · line 464
Quoted 13 lines
job.c +6
-3@@ -468,13 +456,13 @@ void job_enter(Job *job)* called explicitly. */ static void coroutine_fn job_do_yield(Job *job, uint64_t ns) { -job_lock (); -if (ns !=-1 ) { -timer_mod (&job->sleep_timer, ns); + WITH_QEMU_LOCK_GUARD(&job_mutex) { +if (ns !=-1 ) { +timer_mod (&job->sleep_timer, ns); + } + job->busy = false; +job_event_idle (job);Is this new macro safe to use in a coroutine context?
Hi, I suppose it's safe. It would be nice to get some more opinions here.
Quoted 19 lines
Quoted 9 lines
job.c +0
-3} - job->busy = false; -job_event_idle (job); -job_unlock ();qemu_coroutine_yield ();/* Set by job_enter_cond() before re-entering the coroutine. */
I haven't looked into
WITH_QEMU_LOCK_GUARDbefore, I assume it's new. If
it works like I think it does, this change seems good.(I'm assuming it works like a Python context manager and it drops the
lock when it leaves the scope of the macro using GCC/Clang language extensions.)
Quoted 10 lines · Elena Afanasova
Quoted 7 lines
job.c void job_enter(Job *job) · line 464
Quoted 6 lines
job.c +6
-0+ WITH_QEMU_LOCK_GUARD(&job_mutex) { +if (ns !=-1 ) { +timer_mod (&job->sleep_timer, ns); + } + job->busy = false; +job_event_idle (job);Is this new macro safe to use in a coroutine context?
Hi, I suppose it's safe. It would be nice to get some more opinions here.
Yes, the macro is just a wrapper around the qemu_mutex_lock/unlock functions (or qemu_co_mutex_lock/unlock depending on the type of its argument).
Paolo