mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

aio-posix: Assert that aio_poll() is always called in home thread

Browse Source 
aio_poll() has an existing assertion that the function is only called
from the AioContext's home thread if blocking is allowed.

This is not enough, some handlers make assumptions about the thread they
run in. Extend the assertion to non-blocking calls, too.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
This commit is contained in:
Kevin Wolf 2019-02-14 13:13:36 +01:00
parent d70d595429
commit 0dc165c1bd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
util/aio-posix.c
View File

@ -613,6 +613,8 @@ bool aio_poll(AioContext *ctx, bool blocking)
int64_t timeout; int64_t timeout;
int64_t start = 0; int64_t start = 0;
assert(in_aio_context_home_thread(ctx));
/* aio_notify can avoid the expensive event_notifier_set if /* aio_notify can avoid the expensive event_notifier_set if
* everything (file descriptors, bottom halves, timers) will * everything (file descriptors, bottom halves, timers) will
* be re-evaluated before the next blocking poll(). This is * be re-evaluated before the next blocking poll(). This is
@ -621,7 +623,6 @@ bool aio_poll(AioContext *ctx, bool blocking)
* so disable the optimization now. * so disable the optimization now.
*/ */
if (blocking) { if (blocking) {
assert(in_aio_context_home_thread(ctx));
atomic_add(&ctx->notify_me, 2); atomic_add(&ctx->notify_me, 2);
} }