update submodule pointers

[ghc-hetmet.git] / rts / win32 / ThrIOManager.c

diff --git a/rts/win32/ThrIOManager.c b/rts/win32/ThrIOManager.c
index b0da0de..f48b203 100644 (file)
--- a/rts/win32/ThrIOManager.c
+++ b/rts/win32/ThrIOManager.c
@@ -8,7 +8,7 @@
  * ---------------------------------------------------------------------------*/\r
 \r
 #include "Rts.h"\r
-#include "ThrIOManager.h"\r
+#include "IOManager.h"\r
 #include "Prelude.h"\r
 #include <windows.h>\r
 \r
@@ -21,6 +21,15 @@ static HANDLE io_manager_event = INVALID_HANDLE_VALUE;
 // spurios wakeups are returned as zero.\r
 // console events are ((event<<1) | 1)\r
 \r
+#if defined(THREADED_RTS)\r
+\r
+#define EVENT_BUFSIZ 256\r
+Mutex event_buf_mutex;\r
+StgWord32 event_buf[EVENT_BUFSIZ];\r
+nat next_event;\r
+\r
+#endif\r
+\r
 HANDLE\r
 getIOManagerEvent (void)\r
 {\r
@@ -30,49 +39,45 @@ getIOManagerEvent (void)
 #ifdef THREADED_RTS\r
     HANDLE hRes;\r
 \r
+    ACQUIRE_LOCK(&event_buf_mutex);\r
+\r
     if (io_manager_event == INVALID_HANDLE_VALUE) {\r
         hRes = CreateEvent ( NULL, // no security attrs\r
                              TRUE, // manual reset\r
                              FALSE, // initial state,\r
-                             "IO Manager Event" );\r
+                             NULL ); // event name: NULL for private events\r
         if (hRes == NULL) {\r
             sysErrorBelch("getIOManagerEvent");\r
             stg_exit(EXIT_FAILURE);\r
         }\r
         io_manager_event = hRes;\r
-        return hRes;\r
     } else {\r
-        return io_manager_event;\r
+        hRes = io_manager_event;\r
     }\r
+\r
+    RELEASE_LOCK(&event_buf_mutex);\r
+    return hRes;\r
 #else\r
     return NULL;\r
 #endif\r
 }\r
 \r
 \r
-#if defined(THREADED_RTS)\r
-\r
-#define EVENT_BUFSIZ 256\r
-Mutex event_buf_mutex;\r
-StgWord32 event_buf[EVENT_BUFSIZ];\r
-nat next_event;\r
-\r
-#endif\r
-\r
-StgWord32\r
+HsWord32\r
 readIOManagerEvent (void)\r
 {\r
     // This function must exist even in non-THREADED_RTS, \r
     // see getIOManagerEvent() above.\r
 #if defined(THREADED_RTS)\r
-    StgWord32 res;\r
+    HsWord32 res;\r
 \r
     ACQUIRE_LOCK(&event_buf_mutex);\r
+\r
     if (io_manager_event != INVALID_HANDLE_VALUE) {\r
         if (next_event == 0) {\r
             res = 0; // no event to return\r
         } else {\r
-            res = event_buf[--next_event];\r
+            res = (HsWord32)(event_buf[--next_event]);\r
             if (next_event == 0) {\r
                 if (!ResetEvent(io_manager_event)) {\r
                     sysErrorBelch("readIOManagerEvent");\r
@@ -83,7 +88,9 @@ readIOManagerEvent (void)
     } else {\r
         res = 0;\r
     }\r
+\r
     RELEASE_LOCK(&event_buf_mutex);\r
+\r
     // debugBelch("readIOManagerEvent: %d\n", res);\r
     return res;\r
 #else\r
@@ -92,11 +99,12 @@ readIOManagerEvent (void)
 }\r
 \r
 void\r
-sendIOManagerEvent (StgWord32 event)\r
+sendIOManagerEvent (HsWord32 event)\r
 {\r
 #if defined(THREADED_RTS)\r
-    // debugBelch("sendIOManagerEvent: %d\n", event);\r
     ACQUIRE_LOCK(&event_buf_mutex);\r
+\r
+    // debugBelch("sendIOManagerEvent: %d\n", event);\r
     if (io_manager_event != INVALID_HANDLE_VALUE) {\r
         if (next_event == EVENT_BUFSIZ) {\r
             errorBelch("event buffer overflowed; event dropped");\r
@@ -105,24 +113,31 @@ sendIOManagerEvent (StgWord32 event)
                 sysErrorBelch("sendIOManagerEvent");\r
                 stg_exit(EXIT_FAILURE);\r
             }        \r
-            event_buf[next_event++] = event;\r
+            event_buf[next_event++] = (StgWord32)event;\r
         }\r
     }\r
+\r
     RELEASE_LOCK(&event_buf_mutex);\r
 #endif\r
 }    \r
 \r
-#if defined(THREADED_RTS)\r
 void\r
 ioManagerWakeup (void)\r
 {\r
     sendIOManagerEvent(IO_MANAGER_WAKEUP);\r
 }\r
 \r
+#if defined(THREADED_RTS)\r
 void\r
 ioManagerDie (void)\r
 {\r
     sendIOManagerEvent(IO_MANAGER_DIE);\r
+    // IO_MANAGER_DIE must be idempotent, as it is called\r
+    // repeatedly by shutdownCapability().  Try conc059(threaded1) to\r
+    // illustrate the problem.\r
+    ACQUIRE_LOCK(&event_buf_mutex);\r
+    io_manager_event = INVALID_HANDLE_VALUE;\r
+    RELEASE_LOCK(&event_buf_mutex);\r
     // ToDo: wait for the IO manager to pick up the event, and\r
     // then release the Event and Mutex objects we've allocated.\r
 }\r
@@ -137,7 +152,11 @@ ioManagerStart (void)
     Capability *cap;\r
     if (io_manager_event == INVALID_HANDLE_VALUE) {\r
        cap = rts_lock();\r
-       rts_evalIO(cap,&base_GHCziConc_ensureIOManagerIsRunning_closure,NULL);\r
+#if defined(mingw32_HOST_OS) && defined(__PIC__)\r
+       rts_evalIO(cap,_imp__base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);\r
+#else\r
+       rts_evalIO(cap,&base_GHCziConcziIO_ensureIOManagerIsRunning_closure,NULL);\r
+#endif\r
        rts_unlock(cap);\r
     }\r
 }\r