diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2016-11-29 16:50:32 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-11-29 16:50:33 -0500 |
| commit | 6f7ed1e51bf360621a3c2a447045ab3012f68575 (patch) | |
| tree | f6e047df820dce2a049ead7927c1b36e95b2bfdd /includes | |
| parent | 795f8bd460d604c792a5df8cfec937b2a74c3956 (diff) | |
| download | haskell-6f7ed1e51bf360621a3c2a447045ab3012f68575.tar.gz | |
Make globals use sharedCAF
The use of globals is quite painful when multiple rts are loaded, e.g.
when plugins are loaded, which bring in a second rts. The sharedCAF
appraoch was employed for the FastStringTable; I've taken the libery
to extend this to the other globals I could find.
Reviewers: rwbarton, simonmar, austin, hvr, erikd, bgamari
Reviewed By: simonmar, bgamari
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D2575
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/rts/Globals.h | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/includes/rts/Globals.h b/includes/rts/Globals.h index 00553610f5..e3ff643556 100644 --- a/includes/rts/Globals.h +++ b/includes/rts/Globals.h @@ -17,14 +17,23 @@ #ifndef RTS_GLOBALS_H #define RTS_GLOBALS_H -StgStablePtr getOrSetGHCConcSignalSignalHandlerStore(StgStablePtr value); -StgStablePtr getOrSetGHCConcWindowsPendingDelaysStore(StgStablePtr ptr); -StgStablePtr getOrSetGHCConcWindowsIOManagerThreadStore(StgStablePtr ptr); -StgStablePtr getOrSetGHCConcWindowsProddingStore(StgStablePtr ptr); -StgStablePtr getOrSetSystemEventThreadEventManagerStore(StgStablePtr ptr); -StgStablePtr getOrSetSystemEventThreadIOManagerThreadStore(StgStablePtr ptr); -StgStablePtr getOrSetSystemTimerThreadEventManagerStore(StgStablePtr ptr); -StgStablePtr getOrSetSystemTimerThreadIOManagerThreadStore(StgStablePtr ptr); -StgStablePtr getOrSetLibHSghcFastStringTable(StgStablePtr ptr); +#define mkStoreAccessorPrototype(name) \ + StgStablePtr \ + getOrSet##name(StgStablePtr ptr); + +mkStoreAccessorPrototype(GHCConcSignalSignalHandlerStore) +mkStoreAccessorPrototype(GHCConcWindowsPendingDelaysStore) +mkStoreAccessorPrototype(GHCConcWindowsIOManagerThreadStore) +mkStoreAccessorPrototype(GHCConcWindowsProddingStore) +mkStoreAccessorPrototype(SystemEventThreadEventManagerStore) +mkStoreAccessorPrototype(SystemEventThreadIOManagerThreadStore) +mkStoreAccessorPrototype(SystemTimerThreadEventManagerStore) +mkStoreAccessorPrototype(SystemTimerThreadIOManagerThreadStore) +mkStoreAccessorPrototype(LibHSghcFastStringTable) +mkStoreAccessorPrototype(LibHSghcPersistentLinkerState) +mkStoreAccessorPrototype(LibHSghcInitLinkerDone) +mkStoreAccessorPrototype(LibHSghcGlobalDynFlags) +mkStoreAccessorPrototype(LibHSghcStaticOptions) +mkStoreAccessorPrototype(LibHSghcStaticOptionsReady) #endif /* RTS_GLOBALS_H */ |