diff options
author | Sangho Park <sangho1206.park@samsung.com> | 2014-04-11 12:50:52 +0400 |
---|---|---|
committer | Stanislav Vorobiov <s.vorobiov@samsung.com> | 2014-04-14 10:42:25 +0400 |
commit | b611841324d3d95b8f0adbaf22a27d53cd83b858 (patch) | |
tree | 3f78280666a37ff15b37fb7d3ed53b099cffa510 | |
parent | a07192eb5cae5f398f5bcd0992446dd8e6cc58d9 (diff) | |
download | qemu-b611841324d3d95b8f0adbaf22a27d53cd83b858.tar.gz qemu-b611841324d3d95b8f0adbaf22a27d53cd83b858.tar.bz2 qemu-b611841324d3d95b8f0adbaf22a27d53cd83b858.zip |
timer: fix qemu_poll_ns early timeout on windows
g_poll has a problem on windows when using
timeouts < 10ms, in glib/gpoll.c:
/* If not, and we have a significant timeout, poll again with
* timeout then. Note that this will return indication for only
* one event, or only for messages. We ignore timeouts less than
* ten milliseconds as they are mostly pointless on Windows, the
* MsgWaitForMultipleObjectsEx() call will timeout right away
* anyway.
*/
if (retval == 0 && (timeout == INFINITE || timeout >= 10))
retval = poll_rest (poll_msgs, handles, nhandles, fds, nfds, timeout);
so whenever g_poll is called with timeout < 10ms it does
a quick poll instead of wait, this causes significant performance
degradation of qemu, thus we should use WaitForMultipleObjectsEx
directly
Change-Id: I95c7be6a57b9458e5ff2b82605aa5d7c4b6d303b
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
-rw-r--r-- | qemu-timer.c | 91 |
1 files changed, 91 insertions, 0 deletions
diff --git a/qemu-timer.c b/qemu-timer.c index e15ce477cc..9fb92cbbd0 100644 --- a/qemu-timer.c +++ b/qemu-timer.c @@ -315,6 +315,97 @@ int qemu_poll_ns(GPollFD *fds, guint nfds, int64_t timeout) ts.tv_nsec = timeout % 1000000000LL; return ppoll((struct pollfd *)fds, nfds, &ts, NULL); } +#elif defined(_WIN32) + guint i; + HANDLE handles[MAXIMUM_WAIT_OBJECTS]; + gint nhandles = 0; + int num_completed = 0; + gint timeout_ms = qemu_timeout_ns_to_ms(timeout); + + for (i = 0; i < nfds; i++) { + gint j; + + if (fds[i].fd <= 0) { + continue; + } + + /* don't add same handle several times + */ + for (j = 0; j < nhandles; j++) { + if (handles[j] == (HANDLE)fds[i].fd) { + break; + } + } + + if (j == nhandles) { + if (nhandles == MAXIMUM_WAIT_OBJECTS) { + fprintf(stderr, "Too many handles to wait for!\n"); + break; + } else { + handles[nhandles++] = (HANDLE)fds[i].fd; + } + } + } + + for (i = 0; i < nfds; ++i) { + fds[i].revents = 0; + } + + if (timeout_ms == -1) { + timeout_ms = INFINITE; + } + + if (nhandles == 0) { + if (timeout_ms == INFINITE) { + return -1; + } else { + SleepEx(timeout_ms, TRUE); + return 0; + } + } + + while (1) { + DWORD res; + gint j; + + res = WaitForMultipleObjectsEx(nhandles, handles, FALSE, + timeout_ms, TRUE); + + if (res == WAIT_FAILED) { + for (i = 0; i < nfds; ++i) { + fds[i].revents = 0; + } + + return -1; + } else if ((res == WAIT_TIMEOUT) || (res == WAIT_IO_COMPLETION) || + ((int)res < WAIT_OBJECT_0) || + (res >= (WAIT_OBJECT_0 + nhandles))) { + break; + } + + for (i = 0; i < nfds; ++i) { + if (handles[res - WAIT_OBJECT_0] == (HANDLE)fds[i].fd) { + fds[i].revents = fds[i].events; + } + } + + ++num_completed; + + if (nhandles <= 1) { + break; + } + + /* poll the rest of the handles + */ + for (j = res - WAIT_OBJECT_0 + 1; j < nhandles; j++) { + handles[j - 1] = handles[j]; + } + --nhandles; + + timeout_ms = 0; + } + + return num_completed; #else return g_poll(fds, nfds, qemu_timeout_ns_to_ms(timeout)); #endif |