RTS tidyup sweep, first phase

[ghc-hetmet.git] / rts / posix / Select.c

diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index e21ced0..46db405 100644 (file)
--- 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,13 +57,19 @@ 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;
-       IF_DEBUG(scheduler,debugBelch("Waking up sleeping thread %d\n", tso->id));
+       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);
        flag = rtsTrue;
@@ -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);
@@ -251,15 +264,15 @@ awaitEvent(rtsBool wait)
              }
       
              if (ready) {
-                 IF_DEBUG(scheduler,debugBelch("Waking up blocked thread %d\n", tso->id));
+               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;
          }
       }