david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

main-loop: replace WaitForMultipleObjects with g_poll

Browse Source 
On w32, glib implements g_poll using WaitForMultipleObjects
or MsgWaitForMultipleObjects.  This means that we can simplify
our code by switching to g_poll, and at the same time prepare for
adding back glib sources.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Blue Swirl <blauwirbel@gmail.com>
This commit is contained in:
Paolo Bonzini 2012-03-20 10:49:20 +01:00 committed by Blue Swirl
parent d3385eb448
commit 06ac7d4979
1 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
main-loop.c
View File

@ -220,9 +220,9 @@ int main_loop_init(void)
static fd_set rfds, wfds, xfds; static fd_set rfds, wfds, xfds;
static int nfds; static int nfds;
static GPollFD poll_fds[1024 * 2]; /* this is probably overkill */
#ifndef _WIN32 #ifndef _WIN32
static GPollFD poll_fds[1024 * 2]; /* this is probably overkill */
static int n_poll_fds; static int n_poll_fds;
static int max_priority; static int max_priority;
@ -351,6 +351,7 @@ void qemu_del_polling_cb(PollingFunc *func, void *opaque)
/* Wait objects support */ /* Wait objects support */
typedef struct WaitObjects { typedef struct WaitObjects {
int num; int num;
int revents[MAXIMUM_WAIT_OBJECTS + 1];
HANDLE events[MAXIMUM_WAIT_OBJECTS + 1]; HANDLE events[MAXIMUM_WAIT_OBJECTS + 1];
WaitObjectFunc *func[MAXIMUM_WAIT_OBJECTS + 1]; WaitObjectFunc *func[MAXIMUM_WAIT_OBJECTS + 1];
void *opaque[MAXIMUM_WAIT_OBJECTS + 1]; void *opaque[MAXIMUM_WAIT_OBJECTS + 1];
@ -367,6 +368,7 @@ int qemu_add_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque)
w->events[w->num] = handle; w->events[w->num] = handle;
w->func[w->num] = func; w->func[w->num] = func;
w->opaque[w->num] = opaque; w->opaque[w->num] = opaque;
w->revents[w->num] = 0;
w->num++; w->num++;
return 0; return 0;
} }
@ -385,6 +387,7 @@ void qemu_del_wait_object(HANDLE handle, WaitObjectFunc *func, void *opaque)
w->events[i] = w->events[i + 1]; w->events[i] = w->events[i + 1];
w->func[i] = w->func[i + 1]; w->func[i] = w->func[i + 1];
w->opaque[i] = w->opaque[i + 1]; w->opaque[i] = w->opaque[i + 1];
w->revents[i] = w->revents[i + 1];
} }
} }
if (found) { if (found) {
@ -400,9 +403,8 @@ void qemu_fd_register(int fd)
static int os_host_main_loop_wait(int timeout) static int os_host_main_loop_wait(int timeout)
{ {
int ret, ret2, i; int ret, i;
PollingEntry *pe; PollingEntry *pe;
int err;
WaitObjects *w = &wait_objects; WaitObjects *w = &wait_objects;
static struct timeval tv0; static struct timeval tv0;
@ -422,32 +424,24 @@ static int os_host_main_loop_wait(int timeout)
} }
} }
qemu_mutex_unlock_iothread(); for (i = 0; i < w->num; i++) {
ret = WaitForMultipleObjects(w->num, w->events, FALSE, timeout); poll_fds[i].fd = (DWORD) w->events[i];
qemu_mutex_lock_iothread(); poll_fds[i].events = G_IO_IN;
if (WAIT_OBJECT_0 + 0 <= ret && ret <= WAIT_OBJECT_0 + w->num - 1) {
if (w->func[ret - WAIT_OBJECT_0]) {
w->func[ret - WAIT_OBJECT_0](w->opaque[ret - WAIT_OBJECT_0]);
} }
/* Check for additional signaled events */ qemu_mutex_unlock_iothread();
for (i = (ret - WAIT_OBJECT_0 + 1); i < w->num; i++) { ret = g_poll(poll_fds, w->num, timeout);
/* Check if event is signaled */ qemu_mutex_lock_iothread();
ret2 = WaitForSingleObject(w->events[i], 0); if (ret > 0) {
if (ret2 == WAIT_OBJECT_0) { for (i = 0; i < w->num; i++) {
if (w->func[i]) { w->revents[i] = poll_fds[i].revents;
}
for (i = 0; i < w->num; i++) {
if (w->revents[i] && w->func[i]) {
w->func[i](w->opaque[i]); w->func[i](w->opaque[i]);
} }
} else if (ret2 != WAIT_TIMEOUT) {
err = GetLastError();
fprintf(stderr, "WaitForSingleObject error %d %d\n", i, err);
} }
} }
} else if (ret != WAIT_TIMEOUT) {
err = GetLastError();
fprintf(stderr, "WaitForMultipleObjects error %d %d\n", ret, err);
}
/* If an edge-triggered socket event occurred, select will return a /* If an edge-triggered socket event occurred, select will return a
* positive result on the next iteration. We do not need to do anything * positive result on the next iteration. We do not need to do anything