X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FSelect.c;h=fb7f38de353cf5f9d2c93e52719e095fa99cd934;hb=41fea58220e763fcd55830a11a37ff44f21e4358;hp=e21ced03ab63d34b7539e2b2e03aec006ff43814;hpb=0065d5ab628975892cea1ec7303f968c3338cbe1;p=ghc-hetmet.git

diff --git a/rts/posix/Select.c b/rts/posix/Select.c
index e21ced0..fb7f38d 100644
--- a/rts/posix/Select.c
+++ b/rts/posix/Select.c
@@ -10,6 +10,7 @@
 /* #include "PosixSource.h" */
 
 #include "Rts.h"
+#include "Storage.h"
 #include "Schedule.h"
 #include "RtsUtils.h"
 #include "RtsFlags.h"
@@ -60,12 +61,12 @@ wakeUpSleepingThreads(lnat ticks)
     rtsBool flag = rtsFalse;
 
     while (sleeping_queue != END_TSO_QUEUE &&
-	   (int)(ticks - sleeping_queue->block_info.target) > 0) {
+	   (int)(ticks - sleeping_queue->block_info.target) >= 0) {
 	tso = sleeping_queue;
 	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));
+	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 +127,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;
       }
@@ -207,7 +208,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 */
 	  }
@@ -251,7 +252,7 @@ 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;
 		  pushOnRunQueue(&MainCapability,tso);