mirrors/qemu
0
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-01-23 22:13:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

9pfs: changed to use event_notifier instead of qemu_pipe

Browse Source 
Changed to use event_notifier instead of qemu_pipe.
It is necessary for porting 9pfs to Windows and MacOS.

Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
SeokYeon Hwang 2014-10-31 17:03:53 +09:00 committed by Paolo Bonzini
parent 364c3e6b8d
commit 4d91558d60
2 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hw/9pfs/virtio-9p-coth.c
View File

@ -14,6 +14,7 @@
#include "fsdev/qemu-fsdev.h" #include "fsdev/qemu-fsdev.h"
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qemu/event_notifier.h"
#include "block/coroutine.h" #include "block/coroutine.h"
#include "virtio-9p-coth.h" #include "virtio-9p-coth.h"
@ -26,15 +27,11 @@ void co_run_in_worker_bh(void *opaque)
g_thread_pool_push(v9fs_pool.pool, co, NULL); g_thread_pool_push(v9fs_pool.pool, co, NULL);
} }
static void v9fs_qemu_process_req_done(void *arg) static void v9fs_qemu_process_req_done(EventNotifier *e)
{ {
char byte;
ssize_t len;
Coroutine *co; Coroutine *co;
do { event_notifier_test_and_clear(e);
len = read(v9fs_pool.rfd, &byte, sizeof(byte));
} while (len == -1 && errno == EINTR);
while ((co = g_async_queue_try_pop(v9fs_pool.completed)) != NULL) { while ((co = g_async_queue_try_pop(v9fs_pool.completed)) != NULL) {
qemu_coroutine_enter(co, NULL); qemu_coroutine_enter(co, NULL);
@ -43,22 +40,18 @@ static void v9fs_qemu_process_req_done(void *arg)
static void v9fs_thread_routine(gpointer data, gpointer user_data) static void v9fs_thread_routine(gpointer data, gpointer user_data)
{ {
ssize_t len;
char byte = 0;
Coroutine *co = data; Coroutine *co = data;
qemu_coroutine_enter(co, NULL); qemu_coroutine_enter(co, NULL);
g_async_queue_push(v9fs_pool.completed, co); g_async_queue_push(v9fs_pool.completed, co);
do {
len = write(v9fs_pool.wfd, &byte, sizeof(byte)); event_notifier_set(&v9fs_pool.e);
} while (len == -1 && errno == EINTR);
} }
int v9fs_init_worker_threads(void) int v9fs_init_worker_threads(void)
{ {
int ret = 0; int ret = 0;
int notifier_fds[2];
V9fsThPool *p = &v9fs_pool; V9fsThPool *p = &v9fs_pool;
sigset_t set, oldset; sigset_t set, oldset;
@ -66,10 +59,6 @@ int v9fs_init_worker_threads(void)
/* Leave signal handling to the iothread. */ /* Leave signal handling to the iothread. */
pthread_sigmask(SIG_SETMASK, &set, &oldset); pthread_sigmask(SIG_SETMASK, &set, &oldset);
if (qemu_pipe(notifier_fds) == -1) {
ret = -1;
goto err_out;
}
p->pool = g_thread_pool_new(v9fs_thread_routine, p, -1, FALSE, NULL); p->pool = g_thread_pool_new(v9fs_thread_routine, p, -1, FALSE, NULL);
if (!p->pool) { if (!p->pool) {
ret = -1; ret = -1;
@ -84,13 +73,9 @@ int v9fs_init_worker_threads(void)
ret = -1; ret = -1;
goto err_out; goto err_out;
} }
p->rfd = notifier_fds[0]; event_notifier_init(&p->e, 0);
p->wfd = notifier_fds[1];
fcntl(p->rfd, F_SETFL, O_NONBLOCK); event_notifier_set_handler(&p->e, v9fs_qemu_process_req_done);
fcntl(p->wfd, F_SETFL, O_NONBLOCK);
qemu_set_fd_handler(p->rfd, v9fs_qemu_process_req_done, NULL, NULL);
err_out: err_out:
pthread_sigmask(SIG_SETMASK, &oldset, NULL); pthread_sigmask(SIG_SETMASK, &oldset, NULL);
return ret; return ret;

4
hw/9pfs/virtio-9p-coth.h
View File

@ -21,8 +21,8 @@
#include <glib.h> #include <glib.h>
typedef struct V9fsThPool { typedef struct V9fsThPool {
int rfd; EventNotifier e;
int wfd;
GThreadPool *pool; GThreadPool *pool;
GAsyncQueue *completed; GAsyncQueue *completed;
} V9fsThPool; } V9fsThPool;