diff options
author | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2010-12-30 14:39:29 +0000 |
---|---|---|
committer | stbuehler <stbuehler@152afb58-edef-0310-8abb-c4023f1b3aa9> | 2010-12-30 14:39:29 +0000 |
commit | 5cd3ca63af76a3a70d273c3352fbb6ee857366dd (patch) | |
tree | 36d927a041a9accd680e6a31534c566f115a47fb | |
parent | 381a4d206ba7738ac5e36b8cdaf2b6c5efd3d693 (diff) | |
download | lighttpd-5cd3ca63af76a3a70d273c3352fbb6ee857366dd.tar.gz |
reset srv->did_wakeup immediately after fdevent_poll
git-svn-id: svn://svn.lighttpd.net/lighttpd/trunk@2774 152afb58-edef-0310-8abb-c4023f1b3aa9
-rw-r--r-- | src/server.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/server.c b/src/server.c index 05793336..be0accc3 100644 --- a/src/server.c +++ b/src/server.c @@ -868,6 +868,9 @@ static int lighty_mainloop(server *srv) { } n = fdevent_poll(srv->ev, 1000); poll_errno = errno; +#ifdef USE_GTHREAD + g_atomic_int_set(&srv->did_wakeup, 0); +#endif if (n > 0) { /* n is the number of events */ @@ -987,7 +990,6 @@ static handler_t wakeup_handle_fdevent(void *s, void *context, int revent) { UNUSED(con); UNUSED(revent); - g_atomic_int_set(&srv->did_wakeup, 0); (void) read(srv->wakeup_iosocket->fd, buf, sizeof(buf)); return HANDLER_GO_ON; } |