From: Simon Marlow <marlowsd@gmail.com>
Date: Thu, 29 May 2008 11:09:57 +0000 (+0000)
Subject: Make it less fatal to not call ioManagerStart()
X-Git-Tag: 2008-06-01~6
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=eacbef6dc436008473b333df551937224d901092

Make it less fatal to not call ioManagerStart()
For clients that forget to do hs_add_root()
---

diff --git a/rts/win32/ThrIOManager.c b/rts/win32/ThrIOManager.c
index 76747c2..a74aac1 100644
--- a/rts/win32/ThrIOManager.c
+++ b/rts/win32/ThrIOManager.c
@@ -67,8 +67,8 @@ readIOManagerEvent (void)
 #if defined(THREADED_RTS)
     HsWord32 res;
 
-    ACQUIRE_LOCK(&event_buf_mutex);
     if (io_manager_event != INVALID_HANDLE_VALUE) {
+        ACQUIRE_LOCK(&event_buf_mutex);
         if (next_event == 0) {
             res = 0; // no event to return
         } else {
@@ -80,10 +80,10 @@ readIOManagerEvent (void)
                 }
             }
         }
+        RELEASE_LOCK(&event_buf_mutex);
     } else {
         res = 0;
     }
-    RELEASE_LOCK(&event_buf_mutex);
     // debugBelch("readIOManagerEvent: %d\n", res);
     return res;
 #else
@@ -96,8 +96,8 @@ sendIOManagerEvent (HsWord32 event)
 {
 #if defined(THREADED_RTS)
     // debugBelch("sendIOManagerEvent: %d\n", event);
-    ACQUIRE_LOCK(&event_buf_mutex);
     if (io_manager_event != INVALID_HANDLE_VALUE) {
+        ACQUIRE_LOCK(&event_buf_mutex);
         if (next_event == EVENT_BUFSIZ) {
             errorBelch("event buffer overflowed; event dropped");
         } else {
@@ -107,8 +107,8 @@ sendIOManagerEvent (HsWord32 event)
             }        
             event_buf[next_event++] = (StgWord32)event;
         }
+        RELEASE_LOCK(&event_buf_mutex);
     }
-    RELEASE_LOCK(&event_buf_mutex);
 #endif
 }