X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FGlobals.c;h=7b8967f685e4d635e8382d29bf389559cd95bcd3;hb=edc0bafd3fcd01b85a2e8894e5dfe149eb0e0857;hp=00d911ac5625d188fd872890b30f80dac7d8a2a9;hpb=2d5e052d795c99c17b1ca6fa1ca8be7d082be09c;p=ghc-hetmet.git

diff --git a/rts/Globals.c b/rts/Globals.c
index 00d911a..7b8967f 100644
--- a/rts/Globals.c
+++ b/rts/Globals.c
@@ -20,11 +20,12 @@
 
 typedef enum {
     TypeableStore,
-    GHCConcSignalHandlerStore,
-    GHCConcPendingEventsStore,
-    GHCConcPendingDelaysStore,
-    GHCConcIOManagerThreadStore,
-    GHCConcProddingStore,
+    GHCConcSignalSignalHandlerStore,
+    GHCConcWindowsPendingDelaysStore,
+    GHCConcWindowsIOManagerThreadStore,
+    GHCConcWindowsProddingStore,
+    SystemEventThreadEventManagerStore,
+    SystemEventThreadIOManagerThreadStore,
     MaxStoreKey
 } StoreKey;
 
@@ -32,7 +33,7 @@ typedef enum {
 Mutex globalStoreLock;
 #endif
 
-StgStablePtr store[MaxStoreKey];
+static StgStablePtr store[MaxStoreKey];
 
 void
 initGlobalStore(void)
@@ -87,31 +88,37 @@ getOrSetTypeableStore(StgStablePtr ptr)
 }
 
 StgStablePtr
-getOrSetGHCConcSignalHandlerStore(StgStablePtr ptr)
+getOrSetGHCConcSignalSignalHandlerStore(StgStablePtr ptr)
 {
-    return getOrSetKey(GHCConcSignalHandlerStore,ptr);
+    return getOrSetKey(GHCConcSignalSignalHandlerStore,ptr);
 }
 
 StgStablePtr
-getOrSetGHCConcPendingEventsStore(StgStablePtr ptr)
+getOrSetGHCConcWindowsPendingDelaysStore(StgStablePtr ptr)
 {
-    return getOrSetKey(GHCConcPendingEventsStore,ptr);
+    return getOrSetKey(GHCConcWindowsPendingDelaysStore,ptr);
 }
 
 StgStablePtr
-getOrSetGHCConcPendingDelaysStore(StgStablePtr ptr)
+getOrSetGHCConcWindowsIOManagerThreadStore(StgStablePtr ptr)
 {
-    return getOrSetKey(GHCConcPendingDelaysStore,ptr);
+    return getOrSetKey(GHCConcWindowsIOManagerThreadStore,ptr);
 }
 
 StgStablePtr
-getOrSetGHCConcIOManagerThreadStore(StgStablePtr ptr)
+getOrSetGHCConcWindowsProddingStore(StgStablePtr ptr)
 {
-    return getOrSetKey(GHCConcIOManagerThreadStore,ptr);
+    return getOrSetKey(GHCConcWindowsProddingStore,ptr);
 }
 
 StgStablePtr
-getOrSetGHCConcProddingStore(StgStablePtr ptr)
+getOrSetSystemEventThreadEventManagerStore(StgStablePtr ptr)
 {
-    return getOrSetKey(GHCConcProddingStore,ptr);
+    return getOrSetKey(SystemEventThreadEventManagerStore,ptr);
+}
+
+StgStablePtr
+getOrSetSystemEventThreadIOManagerThreadStore(StgStablePtr ptr)
+{
+    return getOrSetKey(SystemEventThreadIOManagerThreadStore,ptr);
 }