2010-10-26 10:39:19 +02:00
|
|
|
/*
|
|
|
|
* os-win32.c
|
|
|
|
*
|
|
|
|
* Copyright (c) 2003-2008 Fabrice Bellard
|
|
|
|
* Copyright (c) 2010 Red Hat, Inc.
|
|
|
|
*
|
|
|
|
* QEMU library functions for win32 which are shared between QEMU and
|
|
|
|
* the QEMU tools.
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|
|
|
* THE SOFTWARE.
|
2014-05-28 17:42:24 +02:00
|
|
|
*
|
|
|
|
* The implementation of g_poll (functions poll_rest, g_poll) at the end of
|
|
|
|
* this file are based on code from GNOME glib-2 and use a different license,
|
|
|
|
* see the license comment there.
|
2010-10-26 10:39:19 +02:00
|
|
|
*/
|
|
|
|
#include <windows.h>
|
2013-05-18 06:31:48 +02:00
|
|
|
#include <glib.h>
|
|
|
|
#include <stdlib.h>
|
2010-10-26 10:39:19 +02:00
|
|
|
#include "config-host.h"
|
2012-12-17 18:20:04 +01:00
|
|
|
#include "sysemu/sysemu.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/main-loop.h"
|
2010-10-26 10:39:19 +02:00
|
|
|
#include "trace.h"
|
2012-12-17 18:20:00 +01:00
|
|
|
#include "qemu/sockets.h"
|
2010-10-26 10:39:19 +02:00
|
|
|
|
2013-05-18 06:31:48 +02:00
|
|
|
/* this must come after including "trace.h" */
|
|
|
|
#include <shlobj.h>
|
|
|
|
|
2010-10-26 10:39:26 +02:00
|
|
|
void *qemu_oom_check(void *ptr)
|
2010-10-26 10:39:19 +02:00
|
|
|
{
|
|
|
|
if (ptr == NULL) {
|
|
|
|
fprintf(stderr, "Failed to allocate memory: %lu\n", GetLastError());
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2014-05-20 12:24:05 +02:00
|
|
|
void *qemu_try_memalign(size_t alignment, size_t size)
|
2010-10-26 10:39:19 +02:00
|
|
|
{
|
|
|
|
void *ptr;
|
|
|
|
|
|
|
|
if (!size) {
|
|
|
|
abort();
|
|
|
|
}
|
2014-05-20 12:24:05 +02:00
|
|
|
ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
|
2010-10-26 10:39:19 +02:00
|
|
|
trace_qemu_memalign(alignment, size, ptr);
|
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
2014-05-20 12:24:05 +02:00
|
|
|
void *qemu_memalign(size_t alignment, size_t size)
|
|
|
|
{
|
|
|
|
return qemu_oom_check(qemu_try_memalign(alignment, size));
|
|
|
|
}
|
|
|
|
|
2014-10-31 17:38:37 +01:00
|
|
|
void *qemu_anon_ram_alloc(size_t size, uint64_t *align)
|
2010-10-26 10:39:19 +02:00
|
|
|
{
|
|
|
|
void *ptr;
|
|
|
|
|
|
|
|
/* FIXME: this is not exactly optimal solution since VirtualAlloc
|
|
|
|
has 64Kb granularity, but at least it guarantees us that the
|
|
|
|
memory is page aligned. */
|
2013-07-31 15:11:11 +02:00
|
|
|
ptr = VirtualAlloc(NULL, size, MEM_COMMIT, PAGE_READWRITE);
|
2013-05-13 16:19:55 +02:00
|
|
|
trace_qemu_anon_ram_alloc(size, ptr);
|
2010-10-26 10:39:19 +02:00
|
|
|
return ptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_vfree(void *ptr)
|
|
|
|
{
|
|
|
|
trace_qemu_vfree(ptr);
|
2013-01-15 14:23:37 +01:00
|
|
|
if (ptr) {
|
|
|
|
VirtualFree(ptr, 0, MEM_RELEASE);
|
|
|
|
}
|
2010-10-26 10:39:19 +02:00
|
|
|
}
|
2010-10-26 10:39:20 +02:00
|
|
|
|
2013-05-13 16:19:56 +02:00
|
|
|
void qemu_anon_ram_free(void *ptr, size_t size)
|
|
|
|
{
|
|
|
|
trace_qemu_anon_ram_free(ptr, size);
|
|
|
|
if (ptr) {
|
|
|
|
VirtualFree(ptr, 0, MEM_RELEASE);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-09-22 22:26:19 +02:00
|
|
|
/* FIXME: add proper locking */
|
|
|
|
struct tm *gmtime_r(const time_t *timep, struct tm *result)
|
|
|
|
{
|
|
|
|
struct tm *p = gmtime(timep);
|
|
|
|
memset(result, 0, sizeof(*result));
|
|
|
|
if (p) {
|
|
|
|
*result = *p;
|
|
|
|
p = result;
|
|
|
|
}
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* FIXME: add proper locking */
|
|
|
|
struct tm *localtime_r(const time_t *timep, struct tm *result)
|
|
|
|
{
|
|
|
|
struct tm *p = localtime(timep);
|
|
|
|
memset(result, 0, sizeof(*result));
|
|
|
|
if (p) {
|
|
|
|
*result = *p;
|
|
|
|
p = result;
|
|
|
|
}
|
|
|
|
return p;
|
|
|
|
}
|
|
|
|
|
2013-03-27 10:10:43 +01:00
|
|
|
void qemu_set_block(int fd)
|
2011-10-05 09:17:32 +02:00
|
|
|
{
|
|
|
|
unsigned long opt = 0;
|
2012-03-20 10:49:19 +01:00
|
|
|
WSAEventSelect(fd, NULL, 0);
|
2011-10-05 09:17:32 +02:00
|
|
|
ioctlsocket(fd, FIONBIO, &opt);
|
|
|
|
}
|
|
|
|
|
2013-03-27 10:10:43 +01:00
|
|
|
void qemu_set_nonblock(int fd)
|
2010-10-26 10:39:20 +02:00
|
|
|
{
|
|
|
|
unsigned long opt = 1;
|
|
|
|
ioctlsocket(fd, FIONBIO, &opt);
|
2012-03-20 10:49:19 +01:00
|
|
|
qemu_fd_register(fd);
|
2010-10-26 10:39:20 +02:00
|
|
|
}
|
|
|
|
|
2013-10-02 12:23:12 +02:00
|
|
|
int socket_set_fast_reuse(int fd)
|
|
|
|
{
|
|
|
|
/* Enabling the reuse of an endpoint that was used by a socket still in
|
|
|
|
* TIME_WAIT state is usually performed by setting SO_REUSEADDR. On Windows
|
|
|
|
* fast reuse is the default and SO_REUSEADDR does strange things. So we
|
|
|
|
* don't have to do anything here. More info can be found at:
|
|
|
|
* http://msdn.microsoft.com/en-us/library/windows/desktop/ms740621.aspx */
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2010-10-26 10:39:20 +02:00
|
|
|
int inet_aton(const char *cp, struct in_addr *ia)
|
|
|
|
{
|
|
|
|
uint32_t addr = inet_addr(cp);
|
|
|
|
if (addr == 0xffffffff) {
|
2014-05-28 17:42:24 +02:00
|
|
|
return 0;
|
2010-10-26 10:39:20 +02:00
|
|
|
}
|
|
|
|
ia->s_addr = addr;
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
|
|
|
void qemu_set_cloexec(int fd)
|
|
|
|
{
|
|
|
|
}
|
2010-10-26 10:39:23 +02:00
|
|
|
|
|
|
|
/* Offset between 1/1/1601 and 1/1/1970 in 100 nanosec units */
|
|
|
|
#define _W32_FT_OFFSET (116444736000000000ULL)
|
|
|
|
|
|
|
|
int qemu_gettimeofday(qemu_timeval *tp)
|
|
|
|
{
|
|
|
|
union {
|
|
|
|
unsigned long long ns100; /*time since 1 Jan 1601 in 100ns units */
|
|
|
|
FILETIME ft;
|
|
|
|
} _now;
|
|
|
|
|
|
|
|
if(tp) {
|
|
|
|
GetSystemTimeAsFileTime (&_now.ft);
|
|
|
|
tp->tv_usec=(long)((_now.ns100 / 10ULL) % 1000000ULL );
|
|
|
|
tp->tv_sec= (long)((_now.ns100 - _W32_FT_OFFSET) / 10000000ULL);
|
|
|
|
}
|
|
|
|
/* Always return 0 as per Open Group Base Specifications Issue 6.
|
|
|
|
Do not set errno on error. */
|
|
|
|
return 0;
|
|
|
|
}
|
2011-09-12 16:20:11 +02:00
|
|
|
|
|
|
|
int qemu_get_thread_id(void)
|
|
|
|
{
|
|
|
|
return GetCurrentThreadId();
|
|
|
|
}
|
2013-05-18 06:31:48 +02:00
|
|
|
|
|
|
|
char *
|
|
|
|
qemu_get_local_state_pathname(const char *relative_pathname)
|
|
|
|
{
|
|
|
|
HRESULT result;
|
|
|
|
char base_path[MAX_PATH+1] = "";
|
|
|
|
|
|
|
|
result = SHGetFolderPath(NULL, CSIDL_COMMON_APPDATA, NULL,
|
|
|
|
/* SHGFP_TYPE_CURRENT */ 0, base_path);
|
|
|
|
if (result != S_OK) {
|
|
|
|
/* misconfigured environment */
|
|
|
|
g_critical("CSIDL_COMMON_APPDATA unavailable: %ld", (long)result);
|
|
|
|
abort();
|
|
|
|
}
|
|
|
|
return g_strdup_printf("%s" G_DIR_SEPARATOR_S "%s", base_path,
|
|
|
|
relative_pathname);
|
|
|
|
}
|
2013-11-14 11:54:16 +01:00
|
|
|
|
|
|
|
void qemu_set_tty_echo(int fd, bool echo)
|
|
|
|
{
|
|
|
|
HANDLE handle = (HANDLE)_get_osfhandle(fd);
|
|
|
|
DWORD dwMode = 0;
|
|
|
|
|
|
|
|
if (handle == INVALID_HANDLE_VALUE) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
GetConsoleMode(handle, &dwMode);
|
|
|
|
|
|
|
|
if (echo) {
|
|
|
|
SetConsoleMode(handle, dwMode | ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT);
|
|
|
|
} else {
|
|
|
|
SetConsoleMode(handle,
|
|
|
|
dwMode & ~(ENABLE_ECHO_INPUT | ENABLE_LINE_INPUT));
|
|
|
|
}
|
|
|
|
}
|
2014-02-10 07:48:51 +01:00
|
|
|
|
|
|
|
static char exec_dir[PATH_MAX];
|
|
|
|
|
|
|
|
void qemu_init_exec_dir(const char *argv0)
|
|
|
|
{
|
|
|
|
|
|
|
|
char *p;
|
|
|
|
char buf[MAX_PATH];
|
|
|
|
DWORD len;
|
|
|
|
|
|
|
|
len = GetModuleFileName(NULL, buf, sizeof(buf) - 1);
|
|
|
|
if (len == 0) {
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
buf[len] = 0;
|
|
|
|
p = buf + len - 1;
|
|
|
|
while (p != buf && *p != '\\') {
|
|
|
|
p--;
|
|
|
|
}
|
|
|
|
*p = 0;
|
|
|
|
if (access(buf, R_OK) == 0) {
|
|
|
|
pstrcpy(exec_dir, sizeof(exec_dir), buf);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
char *qemu_get_exec_dir(void)
|
|
|
|
{
|
|
|
|
return g_strdup(exec_dir);
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
|
|
|
/*
|
2014-05-28 17:42:24 +02:00
|
|
|
* The original implementation of g_poll from glib has a problem on Windows
|
|
|
|
* when using timeouts < 10 ms.
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
*
|
2014-05-28 17:42:24 +02:00
|
|
|
* Whenever g_poll is called with timeout < 10 ms, it does a quick poll instead
|
|
|
|
* of wait. This causes significant performance degradation of QEMU.
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
*
|
2014-05-28 17:42:24 +02:00
|
|
|
* The following code is a copy of the original code from glib/gpoll.c
|
|
|
|
* (glib commit 20f4d1820b8d4d0fc4447188e33efffd6d4a88d8 from 2014-02-19).
|
|
|
|
* Some debug code was removed and the code was reformatted.
|
|
|
|
* All other code modifications are marked with 'QEMU'.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* gpoll.c: poll(2) abstraction
|
|
|
|
* Copyright 1998 Owen Taylor
|
|
|
|
* Copyright 2008 Red Hat, Inc.
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
*
|
2014-05-28 17:42:24 +02:00
|
|
|
* This library is free software; you can redistribute it and/or
|
|
|
|
* modify it under the terms of the GNU Lesser General Public
|
|
|
|
* License as published by the Free Software Foundation; either
|
|
|
|
* version 2 of the License, or (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This library is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
* Lesser General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
* License along with this library; if not, see <http://www.gnu.org/licenses/>.
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
*/
|
2014-05-28 17:42:24 +02:00
|
|
|
|
|
|
|
static int poll_rest(gboolean poll_msgs, HANDLE *handles, gint nhandles,
|
|
|
|
GPollFD *fds, guint nfds, gint timeout)
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
{
|
2014-05-28 17:42:24 +02:00
|
|
|
DWORD ready;
|
|
|
|
GPollFD *f;
|
|
|
|
int recursed_result;
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
if (poll_msgs) {
|
|
|
|
/* Wait for either messages or handles
|
|
|
|
* -> Use MsgWaitForMultipleObjectsEx
|
|
|
|
*/
|
|
|
|
ready = MsgWaitForMultipleObjectsEx(nhandles, handles, timeout,
|
|
|
|
QS_ALLINPUT, MWMO_ALERTABLE);
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
if (ready == WAIT_FAILED) {
|
|
|
|
gchar *emsg = g_win32_error_message(GetLastError());
|
|
|
|
g_warning("MsgWaitForMultipleObjectsEx failed: %s", emsg);
|
|
|
|
g_free(emsg);
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
2014-05-28 17:42:24 +02:00
|
|
|
} else if (nhandles == 0) {
|
|
|
|
/* No handles to wait for, just the timeout */
|
|
|
|
if (timeout == INFINITE) {
|
|
|
|
ready = WAIT_FAILED;
|
|
|
|
} else {
|
|
|
|
SleepEx(timeout, TRUE);
|
|
|
|
ready = WAIT_TIMEOUT;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
/* Wait for just handles
|
|
|
|
* -> Use WaitForMultipleObjectsEx
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
*/
|
2014-05-28 17:42:24 +02:00
|
|
|
ready =
|
|
|
|
WaitForMultipleObjectsEx(nhandles, handles, FALSE, timeout, TRUE);
|
|
|
|
if (ready == WAIT_FAILED) {
|
|
|
|
gchar *emsg = g_win32_error_message(GetLastError());
|
|
|
|
g_warning("WaitForMultipleObjectsEx failed: %s", emsg);
|
|
|
|
g_free(emsg);
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
2014-05-28 17:42:24 +02:00
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
if (ready == WAIT_FAILED) {
|
|
|
|
return -1;
|
|
|
|
} else if (ready == WAIT_TIMEOUT || ready == WAIT_IO_COMPLETION) {
|
|
|
|
return 0;
|
|
|
|
} else if (poll_msgs && ready == WAIT_OBJECT_0 + nhandles) {
|
|
|
|
for (f = fds; f < &fds[nfds]; ++f) {
|
|
|
|
if (f->fd == G_WIN32_MSG_HANDLE && f->events & G_IO_IN) {
|
|
|
|
f->revents |= G_IO_IN;
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
/* If we have a timeout, or no handles to poll, be satisfied
|
|
|
|
* with just noticing we have messages waiting.
|
|
|
|
*/
|
|
|
|
if (timeout != 0 || nhandles == 0) {
|
|
|
|
return 1;
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
/* If no timeout and handles to poll, recurse to poll them,
|
|
|
|
* too.
|
|
|
|
*/
|
|
|
|
recursed_result = poll_rest(FALSE, handles, nhandles, fds, nfds, 0);
|
|
|
|
return (recursed_result == -1) ? -1 : 1 + recursed_result;
|
|
|
|
} else if (/* QEMU: removed the following unneeded statement which causes
|
|
|
|
* a compiler warning: ready >= WAIT_OBJECT_0 && */
|
|
|
|
ready < WAIT_OBJECT_0 + nhandles) {
|
|
|
|
for (f = fds; f < &fds[nfds]; ++f) {
|
|
|
|
if ((HANDLE) f->fd == handles[ready - WAIT_OBJECT_0]) {
|
|
|
|
f->revents = f->events;
|
|
|
|
}
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
/* If no timeout and polling several handles, recurse to poll
|
|
|
|
* the rest of them.
|
|
|
|
*/
|
|
|
|
if (timeout == 0 && nhandles > 1) {
|
|
|
|
/* Remove the handle that fired */
|
|
|
|
int i;
|
|
|
|
if (ready < nhandles - 1) {
|
|
|
|
for (i = ready - WAIT_OBJECT_0 + 1; i < nhandles; i++) {
|
|
|
|
handles[i-1] = handles[i];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
nhandles--;
|
|
|
|
recursed_result = poll_rest(FALSE, handles, nhandles, fds, nfds, 0);
|
|
|
|
return (recursed_result == -1) ? -1 : 1 + recursed_result;
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
2014-05-28 17:42:24 +02:00
|
|
|
return 1;
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
return 0;
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
gint g_poll(GPollFD *fds, guint nfds, gint timeout)
|
|
|
|
{
|
|
|
|
HANDLE handles[MAXIMUM_WAIT_OBJECTS];
|
|
|
|
gboolean poll_msgs = FALSE;
|
|
|
|
GPollFD *f;
|
|
|
|
gint nhandles = 0;
|
|
|
|
int retval;
|
|
|
|
|
|
|
|
for (f = fds; f < &fds[nfds]; ++f) {
|
|
|
|
if (f->fd == G_WIN32_MSG_HANDLE && (f->events & G_IO_IN)) {
|
|
|
|
poll_msgs = TRUE;
|
|
|
|
} else if (f->fd > 0) {
|
|
|
|
/* Don't add the same handle several times into the array, as
|
|
|
|
* docs say that is not allowed, even if it actually does seem
|
|
|
|
* to work.
|
|
|
|
*/
|
|
|
|
gint i;
|
|
|
|
|
|
|
|
for (i = 0; i < nhandles; i++) {
|
|
|
|
if (handles[i] == (HANDLE) f->fd) {
|
|
|
|
break;
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
if (i == nhandles) {
|
|
|
|
if (nhandles == MAXIMUM_WAIT_OBJECTS) {
|
|
|
|
g_warning("Too many handles to wait for!\n");
|
|
|
|
break;
|
|
|
|
} else {
|
|
|
|
handles[nhandles++] = (HANDLE) f->fd;
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
|
|
|
}
|
2014-05-28 17:42:24 +02:00
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
for (f = fds; f < &fds[nfds]; ++f) {
|
|
|
|
f->revents = 0;
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
if (timeout == -1) {
|
|
|
|
timeout = INFINITE;
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
/* Polling for several things? */
|
|
|
|
if (nhandles > 1 || (nhandles > 0 && poll_msgs)) {
|
|
|
|
/* First check if one or several of them are immediately
|
|
|
|
* available
|
|
|
|
*/
|
|
|
|
retval = poll_rest(poll_msgs, handles, nhandles, fds, nfds, 0);
|
|
|
|
|
|
|
|
/* 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.
|
|
|
|
*
|
|
|
|
* Modification for QEMU: replaced timeout >= 10 by timeout > 0.
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
*/
|
2014-05-28 17:42:24 +02:00
|
|
|
if (retval == 0 && (timeout == INFINITE || timeout > 0)) {
|
|
|
|
retval = poll_rest(poll_msgs, handles, nhandles,
|
|
|
|
fds, nfds, timeout);
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
2014-05-28 17:42:24 +02:00
|
|
|
} else {
|
|
|
|
/* Just polling for one thing, so no need to check first if
|
|
|
|
* available immediately
|
|
|
|
*/
|
|
|
|
retval = poll_rest(poll_msgs, handles, nhandles, fds, nfds, timeout);
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
if (retval == -1) {
|
|
|
|
for (f = fds; f < &fds[nfds]; ++f) {
|
|
|
|
f->revents = 0;
|
|
|
|
}
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
|
|
|
|
2014-05-28 17:42:24 +02:00
|
|
|
return retval;
|
glib: fix g_poll 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
Signed-off-by: Stanislav Vorobiov <s.vorobiov@samsung.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
2014-05-08 10:47:10 +02:00
|
|
|
}
|
2014-05-14 11:43:21 +02:00
|
|
|
|
|
|
|
size_t getpagesize(void)
|
|
|
|
{
|
|
|
|
SYSTEM_INFO system_info;
|
|
|
|
|
|
|
|
GetSystemInfo(&system_info);
|
|
|
|
return system_info.dwPageSize;
|
|
|
|
}
|
|
|
|
|
|
|
|
void os_mem_prealloc(int fd, char *area, size_t memory)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
size_t pagesize = getpagesize();
|
|
|
|
|
|
|
|
memory = (memory + pagesize - 1) & -pagesize;
|
|
|
|
for (i = 0; i < memory / pagesize; i++) {
|
|
|
|
memset(area + pagesize * i, 0, 1);
|
|
|
|
}
|
|
|
|
}
|