X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fposix%2FSignals.c;h=ace58c2f982364936385615d693549e6acb4ba91;hb=1c4738ba866893b3b5c7c9952e9a1bf48e2aa055;hp=8268e6fe7444b581f6abc8db0dec70beb9e85b1e;hpb=1e0f31543a0ee99c712c517de2bb1053e046b8db;p=ghc-hetmet.git

diff --git a/rts/posix/Signals.c b/rts/posix/Signals.c
index 8268e6f..ace58c2 100644
--- a/rts/posix/Signals.c
+++ b/rts/posix/Signals.c
@@ -95,27 +95,33 @@ setIOManagerPipe (int fd)
 {
     // only called when THREADED_RTS, but unconditionally
     // compiled here because GHC.Conc depends on it.
-    io_manager_pipe = fd;
+    if (io_manager_pipe < 0) {
+        io_manager_pipe = fd;
+    }
 }
 
 #if defined(THREADED_RTS)
 void
 ioManagerWakeup (void)
 {
+    int r;
     // Wake up the IO Manager thread by sending a byte down its pipe
     if (io_manager_pipe >= 0) {
 	StgWord8 byte = (StgWord8)IO_MANAGER_WAKEUP;
-	write(io_manager_pipe, &byte, 1);
+	r = write(io_manager_pipe, &byte, 1);
+        if (r == -1) { sysErrorBelch("ioManagerWakeup: write"); }
     }
 }
 
 void
 ioManagerDie (void)
 {
+    int r;
     // Ask the IO Manager thread to exit
     if (io_manager_pipe >= 0) {
 	StgWord8 byte = (StgWord8)IO_MANAGER_DIE;
-	write(io_manager_pipe, &byte, 1);
+	r = write(io_manager_pipe, &byte, 1);
+        if (r == -1) { sysErrorBelch("ioManagerDie: write"); }
         close(io_manager_pipe);
         io_manager_pipe = -1;
     }
@@ -214,7 +220,7 @@ generic_handler(int sig USED_IF_THREADS,
 	stg_exit(EXIT_FAILURE);
     }
     
-    MainCapability.context_switch = 1;
+    contextSwitchCapability(&MainCapability);
 
 #endif /* THREADED_RTS */
 }