X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FSelect.c;h=46db4054bb6917eba1d45d9abd5ae02d6830ac95;hb=6cf8982ac30be6836a0cdd8be5a6ac1a1a144213;hp=0dbacef7a816a175351c35efea530c8fcddda861;hpb=f9e1c2af8fdd112019a657e66b0cd685d8df66f6;p=ghc-hetmet.git

diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index 0dbacef..46db405 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -6,18 +6,16 @@
  *
  * ---------------------------------------------------------------------------*/
 
-/* we're outside the realms of POSIX here... */
-/* #include "PosixSource.h" */
-
+#include "PosixSource.h"
 #include "Rts.h"
+
+#include "Signals.h"
 #include "Schedule.h"
 #include "RtsUtils.h"
-#include "RtsFlags.h"
-#include "Timer.h"
 #include "Itimer.h"
-#include "Signals.h"
 #include "Capability.h"
-#include "posix/Select.h"
+#include "Select.h"
+#include "AwaitEvent.h"
 
 # ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
@@ -59,12 +57,18 @@ wakeUpSleepingThreads(lnat ticks)
     StgTSO *tso;
     rtsBool flag = rtsFalse;
 
-    while (sleeping_queue != END_TSO_QUEUE &&
-	   (int)(ticks - sleeping_queue->block_info.target) > 0) {
+    while (sleeping_queue != END_TSO_QUEUE) {
 	tso = sleeping_queue;
-	sleeping_queue = tso->link;
+        if (tso->what_next == ThreadRelocated) {
+            sleeping_queue = tso->_link;
+            continue;
+        }
+        if (((long)ticks - (long)tso->block_info.target) < 0) {
+            break;
+        }
+	sleeping_queue = tso->_link;
 	tso->why_blocked = NotBlocked;
-	tso->link = END_TSO_QUEUE;
+	tso->_link = END_TSO_QUEUE;
 	IF_DEBUG(scheduler,debugBelch("Waking up sleeping thread %lu\n", (unsigned long)tso->id));
 	// MainCapability: this code is !THREADED_RTS
 	pushOnRunQueue(&MainCapability,tso);
@@ -126,7 +130,7 @@ awaitEvent(rtsBool wait)
 	  min = 0;
       } else if (sleeping_queue != END_TSO_QUEUE) {
 	  min = (sleeping_queue->block_info.target - ticks) 
-	      * TICK_MILLISECS * 1000;
+	      * RtsFlags.MiscFlags.tickInterval * 1000;
       } else {
 	  min = 0x7ffffff;
       }
@@ -138,13 +142,17 @@ awaitEvent(rtsBool wait)
       FD_ZERO(&wfd);
 
       for(tso = blocked_queue_hd; tso != END_TSO_QUEUE; tso = next) {
-	next = tso->link;
+	next = tso->_link;
 
+      /* On FreeBSD FD_SETSIZE is unsigned. Cast it to signed int
+       * in order to switch off the 'comparison between signed and
+       * unsigned error message
+       */
 	switch (tso->why_blocked) {
 	case BlockedOnRead:
 	  { 
 	    int fd = tso->block_info.fd;
-	    if (fd >= FD_SETSIZE) {
+	    if (fd >= (int)FD_SETSIZE) {
 		barf("awaitEvent: descriptor out of range");
 	    }
 	    maxfd = (fd > maxfd) ? fd : maxfd;
@@ -155,7 +163,7 @@ awaitEvent(rtsBool wait)
 	case BlockedOnWrite:
 	  { 
 	    int fd = tso->block_info.fd;
-	    if (fd >= FD_SETSIZE) {
+	    if (fd >= (int)FD_SETSIZE) {
 		barf("awaitEvent: descriptor out of range");
 	    }
 	    maxfd = (fd > maxfd) ? fd : maxfd;
@@ -207,7 +215,7 @@ awaitEvent(rtsBool wait)
 	   * serviced.
 	   */
 #if defined(RTS_USER_SIGNALS)
-	  if (signals_pending()) {
+	  if (RtsFlags.MiscFlags.install_signal_handlers && signals_pending()) {
 	      startSignalHandlers(&MainCapability);
 	      return; /* still hold the lock */
 	  }
@@ -238,7 +246,12 @@ awaitEvent(rtsBool wait)
       prev = NULL;
       if (select_succeeded || unblock_all) {
 	  for(tso = blocked_queue_hd; tso != END_TSO_QUEUE; tso = next) {
-	      next = tso->link;
+	      next = tso->_link;
+
+              if (tso->what_next == ThreadRelocated) {
+                  continue;
+              }
+
 	      switch (tso->why_blocked) {
 	      case BlockedOnRead:
 		  ready = unblock_all || FD_ISSET(tso->block_info.fd, &rfd);
@@ -253,13 +266,13 @@ awaitEvent(rtsBool wait)
 	      if (ready) {
 		IF_DEBUG(scheduler,debugBelch("Waking up blocked thread %lu\n", (unsigned long)tso->id));
 		  tso->why_blocked = NotBlocked;
-		  tso->link = END_TSO_QUEUE;
+		  tso->_link = END_TSO_QUEUE;
 		  pushOnRunQueue(&MainCapability,tso);
 	      } else {
 		  if (prev == NULL)
 		      blocked_queue_hd = tso;
 		  else
-		      prev->link = tso;
+		      setTSOLink(&MainCapability, prev, tso);
 		  prev = tso;
 	      }
 	  }
@@ -267,7 +280,7 @@ awaitEvent(rtsBool wait)
 	  if (prev == NULL)
 	      blocked_queue_hd = blocked_queue_tl = END_TSO_QUEUE;
 	  else {
-	      prev->link = END_TSO_QUEUE;
+	      prev->_link = END_TSO_QUEUE;
 	      blocked_queue_tl = prev;
 	  }
       }