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

diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index ae9c717..46db405 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -6,19 +6,16 @@
  *
  * ---------------------------------------------------------------------------*/
 
-/* we're outside the realms of POSIX here... */
-/* #include "PosixSource.h" */
-
+#include "PosixSource.h"
 #include "Rts.h"
-#include "Storage.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>
@@ -60,9 +57,15 @@ 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;
+        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;
@@ -244,6 +247,11 @@ awaitEvent(rtsBool wait)
       if (select_succeeded || unblock_all) {
 	  for(tso = blocked_queue_hd; tso != END_TSO_QUEUE; tso = next) {
 	      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);