diff options
| author | Johan Tibell <johan.tibell@gmail.com> | 2010-07-24 10:23:55 +0000 |
|---|---|---|
| committer | Johan Tibell <johan.tibell@gmail.com> | 2010-07-24 10:23:55 +0000 |
| commit | 401140734891ca804c336122581743251d61b3a6 (patch) | |
| tree | 67dcaaf1945f3cb12b04cd31a2083c20f6cbc94f /includes | |
| parent | 0cbdc7b1bd76c61ad31a14a43398ae05ce138489 (diff) | |
| download | haskell-401140734891ca804c336122581743251d61b3a6.tar.gz | |
Integrate new I/O manager, with signal support
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/Globals.h | 11 | ||||
| -rw-r--r-- | includes/rts/IOManager.h | 4 |
2 files changed, 8 insertions, 7 deletions
diff --git a/includes/rts/Globals.h b/includes/rts/Globals.h index 75c7f69fe4..218b7ef155 100644 --- a/includes/rts/Globals.h +++ b/includes/rts/Globals.h @@ -18,10 +18,11 @@ #define RTS_GLOBALS_H StgStablePtr getOrSetTypeableStore(StgStablePtr value); -StgStablePtr getOrSetGHCConcSignalHandlerStore(StgStablePtr value); -StgStablePtr getOrSetGHCConcPendingEventsStore(StgStablePtr ptr); -StgStablePtr getOrSetGHCConcPendingDelaysStore(StgStablePtr ptr); -StgStablePtr getOrSetGHCConcIOManagerThreadStore(StgStablePtr ptr); -StgStablePtr getOrSetGHCConcProddingStore(StgStablePtr ptr); +StgStablePtr getOrSetGHCConcSignalSignalHandlerStore(StgStablePtr value); +StgStablePtr getOrSetGHCConcWindowsPendingDelaysStore(StgStablePtr ptr); +StgStablePtr getOrSetGHCConcWindowsIOManagerThreadStore(StgStablePtr ptr); +StgStablePtr getOrSetGHCConcWindowsProddingStore(StgStablePtr ptr); +StgStablePtr getOrSetSystemEventThreadEventManagerStore(StgStablePtr ptr); +StgStablePtr getOrSetSystemEventThreadIOManagerThreadStore(StgStablePtr ptr); #endif /* RTS_GLOBALS_H */ diff --git a/includes/rts/IOManager.h b/includes/rts/IOManager.h index 3aedda8b55..bf93d97a80 100644 --- a/includes/rts/IOManager.h +++ b/includes/rts/IOManager.h @@ -26,8 +26,8 @@ void sendIOManagerEvent (HsWord32 event); #else -void setIOManagerPipe (int fd); -void ioManagerSync (void); +void setIOManagerControlFd (int fd); +void setIOManagerWakeupFd (int fd); #endif |