From 3e877f984e55becb2f2df7977887fd812cd39c17 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 31 Mar 2008 07:37:17 +0000 Subject: [PATCH] Bug 525192 - 100% CPU if run main loop with no IO sources 2008-03-31 Tor Lillqvist Bug 525192 - 100% CPU if run main loop with no IO sources * glib/gmain.c (g_poll) [Win32]: Patch by Neil Roberts. svn path=/trunk/; revision=6787 --- ChangeLog | 6 ++++++ glib/gmain.c | 10 ++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e81e33d1..886bc9f5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-03-31 Tor Lillqvist + + Bug 525192 - 100% CPU if run main loop with no IO sources + + * glib/gmain.c (g_poll) [Win32]: Patch by Neil Roberts. + 2008-03-30 Matthias Clasen * glib/gtester.c: Don't use ARG_MAX. (#522335, patch by diff --git a/glib/gmain.c b/glib/gmain.c index 93ae0092..d833efcb 100644 --- a/glib/gmain.c +++ b/glib/gmain.c @@ -383,8 +383,14 @@ g_poll (GPollFD *fds, } else if (nhandles == 0) { - /* Wait for nothing (huh?) */ - return 0; + /* No handles to wait for, just the timeout */ + if (timeout == INFINITE) + ready = WAIT_FAILED; + else + { + Sleep (timeout); + ready = WAIT_TIMEOUT; + } } else { -- 2.34.1