diff options
| author | Kevin Wolf <kwolf@redhat.com> | 2018-09-05 18:14:17 +0200 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2018-09-25 15:50:15 +0200 |
| commit | 486574483aba988c83b20e7d3f1ccd50c4c333d8 (patch) | |
| tree | a09a6a9d2eba3720d14f5cbfdc6bf2278ecf53bb /include | |
| parent | 34dc97b9a0e592bc466bdb0bbfe45d77304a72b6 (diff) | |
| download | qemu-486574483aba988c83b20e7d3f1ccd50c4c333d8.zip qemu-486574483aba988c83b20e7d3f1ccd50c4c333d8.tar.gz qemu-486574483aba988c83b20e7d3f1ccd50c4c333d8.tar.bz2 | |
aio-wait: Increase num_waiters even in home thread
Even if AIO_WAIT_WHILE() is called in the home context of the
AioContext, we still want to allow the condition to change depending on
other threads as long as they kick the AioWait. Specfically block jobs
can be running in an I/O thread and should then be able to kick a drain
in the main loop context.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Fam Zheng <famz@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/block/aio-wait.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/block/aio-wait.h b/include/block/aio-wait.h index c85a62f..600fad1 100644 --- a/include/block/aio-wait.h +++ b/include/block/aio-wait.h @@ -76,6 +76,8 @@ typedef struct { bool waited_ = false; \ AioWait *wait_ = (wait); \ AioContext *ctx_ = (ctx); \ + /* Increment wait_->num_waiters before evaluating cond. */ \ + atomic_inc(&wait_->num_waiters); \ if (ctx_ && in_aio_context_home_thread(ctx_)) { \ while ((cond)) { \ aio_poll(ctx_, true); \ @@ -84,8 +86,6 @@ typedef struct { } else { \ assert(qemu_get_current_aio_context() == \ qemu_get_aio_context()); \ - /* Increment wait_->num_waiters before evaluating cond. */ \ - atomic_inc(&wait_->num_waiters); \ while ((cond)) { \ if (ctx_) { \ aio_context_release(ctx_); \ @@ -96,8 +96,8 @@ typedef struct { } \ waited_ = true; \ } \ - atomic_dec(&wait_->num_waiters); \ } \ + atomic_dec(&wait_->num_waiters); \ waited_; }) /** |