From: Ron Koenderink <rkoenderink@yahoo.ca>
Date: Sun, 8 Feb 2009 02:09:30 +0000 (-0600)
Subject: Fix update thread not successfully waking up with LWP
X-Git-Tag: v4.3.20~47
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=4c32aac8326b818be020de49aa9498ede23ebc68

Fix update thread not successfully waking up with LWP

Commit 08b945568 broke empth_sleep() for LWP: it returned zero even
when woken up early.
---

diff --git a/src/lib/lwp/sel.c b/src/lib/lwp/sel.c
index aa1e66a41..27b3d0c82 100644
--- a/src/lib/lwp/sel.c
+++ b/src/lib/lwp/sel.c
@@ -132,9 +132,9 @@ lwpWakeupFd(struct lwpProc *proc)
 	return;
 
     lwpStatus(proc, "awakening; was sleeping on fd %d", proc->fd);
-    if (proc->runtime != (time_t)-1) {
+    if (proc->runtime != (time_t)-1 && proc->runtime != 0) {
 	/* is in LwpDelayq; leave the job to lwpWakeupSleep() */
-	proc->runtime = 0;
+	proc->runtime = (time_t)-1;
 	return;
     }
     FD_CLR(proc->fd, &LwpReadfds);
@@ -161,7 +161,8 @@ lwpWakeupSleep(void)
 	while (NULL != (proc = lwpGetFirst(&LwpDelayq))) {
 	    if (now >= proc->runtime) {
 		lwpStatus(proc, "sleep done");
-		proc->runtime = (time_t)-1;
+		if (proc->runtime != 0)
+		    proc->runtime = (time_t)-1;
 		if (proc->fd >= 0)
 		    lwpWakeupFd(proc);
 		else