Skip to content

Commit

Permalink
aio: introduce qemu_get_current_aio_context
Browse files Browse the repository at this point in the history
This will be used by BDRV_POLL_WHILE (and thus by bdrv_drain)
to choose how to wait for I/O completion.

Reviewed-by: Fam Zheng <[email protected]>
Signed-off-by: Paolo Bonzini <[email protected]>
Message-Id: <[email protected]>
Signed-off-by: Fam Zheng <[email protected]>
  • Loading branch information
bonzini authored and Fam Zheng committed Oct 28, 2016
1 parent f11672d commit e437016
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 0 deletions.
18 changes: 18 additions & 0 deletions include/block/aio.h
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,24 @@ static inline bool aio_node_check(AioContext *ctx, bool is_external)
return !is_external || !atomic_read(&ctx->external_disable_cnt);
}

/**
* Return the AioContext whose event loop runs in the current thread.
*
* If called from an IOThread this will be the IOThread's AioContext. If
* called from another thread it will be the main loop AioContext.
*/
AioContext *qemu_get_current_aio_context(void);

/**
* @ctx: the aio context
*
* Return whether we are running in the I/O thread that manages @ctx.
*/
static inline bool aio_context_in_iothread(AioContext *ctx)
{
return ctx == qemu_get_current_aio_context();
}

/**
* aio_context_setup:
* @ctx: the aio context
Expand Down
9 changes: 9 additions & 0 deletions iothread.c
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
#include "qmp-commands.h"
#include "qemu/error-report.h"
#include "qemu/rcu.h"
#include "qemu/main-loop.h"

typedef ObjectClass IOThreadClass;

Expand All @@ -28,13 +29,21 @@ typedef ObjectClass IOThreadClass;
#define IOTHREAD_CLASS(klass) \
OBJECT_CLASS_CHECK(IOThreadClass, klass, TYPE_IOTHREAD)

static __thread IOThread *my_iothread;

AioContext *qemu_get_current_aio_context(void)
{
return my_iothread ? my_iothread->ctx : qemu_get_aio_context();
}

static void *iothread_run(void *opaque)
{
IOThread *iothread = opaque;
bool blocking;

rcu_register_thread();

my_iothread = iothread;
qemu_mutex_lock(&iothread->init_done_lock);
iothread->thread_id = qemu_get_thread_id();
qemu_cond_signal(&iothread->init_done_cond);
Expand Down
1 change: 1 addition & 0 deletions stubs/Makefile.objs
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ stub-obj-y += gdbstub.o
stub-obj-y += get-fd.o
stub-obj-y += get-next-serial.o
stub-obj-y += get-vm-name.o
stub-obj-y += iothread.o
stub-obj-y += iothread-lock.o
stub-obj-y += is-daemonized.o
stub-obj-y += machine-init-done.o
Expand Down
8 changes: 8 additions & 0 deletions stubs/iothread.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#include "qemu/osdep.h"
#include "block/aio.h"
#include "qemu/main-loop.h"

AioContext *qemu_get_current_aio_context(void)
{
return qemu_get_aio_context();
}

0 comments on commit e437016

Please sign in to comment.