X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FSelect.c;h=3c87fbdc70ee66ec16024f4abfb03f6b9022f721;hb=f30d527344db528618f64a25250a3be557d9f287;hp=8af57bac6ff29c69aeda464dbe65a9890d5cf977;hpb=a6e73f94c732f3080329fd86ab5361531cb226b5;p=ghc-hetmet.git

diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index 8af57ba..3c87fbd 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -6,19 +6,20 @@
  *
  * ---------------------------------------------------------------------------*/
 
-/* 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_SELECT_H
+#  include <sys/select.h>
+# endif
 
 # ifdef HAVE_SYS_TYPES_H
 #  include <sys/types.h>
@@ -60,12 +61,14 @@ 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 (((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);
@@ -74,6 +77,13 @@ wakeUpSleepingThreads(lnat ticks)
     return flag;
 }
 
+static void GNUC3_ATTRIBUTE(__noreturn__)
+fdOutOfRange (int fd)
+{
+    errorBelch("file descriptor %d out of range for select (0--%d).\nRecompile with -threaded to work around this.", fd, (int)FD_SETSIZE);
+    stg_exit(EXIT_FAILURE);
+}
+
 /* Argument 'wait' says whether to wait for I/O to become available,
  * or whether to just check and return immediately.  If there are
  * other threads ready to run, we normally do the non-waiting variety,
@@ -139,7 +149,7 @@ 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
@@ -149,8 +159,8 @@ awaitEvent(rtsBool wait)
 	case BlockedOnRead:
 	  { 
 	    int fd = tso->block_info.fd;
-	    if (fd >= (int)FD_SETSIZE) {
-		barf("awaitEvent: descriptor out of range");
+	    if ((fd >= (int)FD_SETSIZE) || (fd < 0)) {
+                fdOutOfRange(fd);
 	    }
 	    maxfd = (fd > maxfd) ? fd : maxfd;
 	    FD_SET(fd, &rfd);
@@ -160,8 +170,8 @@ awaitEvent(rtsBool wait)
 	case BlockedOnWrite:
 	  { 
 	    int fd = tso->block_info.fd;
-	    if (fd >= (int)FD_SETSIZE) {
-		barf("awaitEvent: descriptor out of range");
+	    if ((fd >= (int)FD_SETSIZE) || (fd < 0)) {
+                fdOutOfRange(fd);
 	    }
 	    maxfd = (fd > maxfd) ? fd : maxfd;
 	    FD_SET(fd, &wfd);
@@ -243,8 +253,9 @@ awaitEvent(rtsBool wait)
       prev = NULL;
       if (select_succeeded || unblock_all) {
 	  for(tso = blocked_queue_hd; tso != END_TSO_QUEUE; tso = next) {
-	      next = tso->link;
-	      switch (tso->why_blocked) {
+	      next = tso->_link;
+
+              switch (tso->why_blocked) {
 	      case BlockedOnRead:
 		  ready = unblock_all || FD_ISSET(tso->block_info.fd, &rfd);
 		  break;
@@ -258,13 +269,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;
 	      }
 	  }
@@ -272,7 +283,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;
 	  }
       }
@@ -282,3 +293,4 @@ awaitEvent(rtsBool wait)
 }
 
 #endif /* THREADED_RTS */
+