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

io: Make qio_channel_yield() interruptible

Browse Source 
Similar to how qemu_co_sleep_ns() allows preemption from an external
coroutine entry, allow reentering qio_channel_yield() early.

Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Kevin Wolf 2019-02-18 14:09:32 +01:00
parent 5ad81b4946
commit 6886ceaf61
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/io/channel.h
View File

@ -739,10 +739,13 @@ void qio_channel_detach_aio_context(QIOChannel *ioc);
* addition, no two coroutine can be waiting on the same condition * addition, no two coroutine can be waiting on the same condition
* and channel at the same time. * and channel at the same time.
* *
* This must only be called from coroutine context * This must only be called from coroutine context. It is safe to
* reenter the coroutine externally while it is waiting; in this
* case the function will return even if @condition is not yet
* available.
*/ */
void qio_channel_yield(QIOChannel *ioc, void coroutine_fn qio_channel_yield(QIOChannel *ioc,
GIOCondition condition); GIOCondition condition);
/** /**
* qio_channel_wait: * qio_channel_wait:

10
io/channel.c
View File

@ -469,6 +469,16 @@ void coroutine_fn qio_channel_yield(QIOChannel *ioc,
} }
qio_channel_set_aio_fd_handlers(ioc); qio_channel_set_aio_fd_handlers(ioc);
qemu_coroutine_yield(); qemu_coroutine_yield();
/* Allow interrupting the operation by reentering the coroutine other than
* through the aio_fd_handlers. */
if (condition == G_IO_IN && ioc->read_coroutine) {
ioc->read_coroutine = NULL;
qio_channel_set_aio_fd_handlers(ioc);
} else if (condition == G_IO_OUT && ioc->write_coroutine) {
ioc->write_coroutine = NULL;
qio_channel_set_aio_fd_handlers(ioc);
}
} }