diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2009-01-06 15:44:08 +0000 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2009-01-06 15:44:08 +0000 |
| commit | b55e7b53eb4af373764969ab9cfd5a4ef4bc9b8d (patch) | |
| tree | ab592325fcf5b88664152100c7582b788bbc7267 /rts | |
| parent | f31b2a4a57473ca78fe1b9a1b7cd11f22aeff87d (diff) | |
| download | haskell-b55e7b53eb4af373764969ab9cfd5a4ef4bc9b8d.tar.gz | |
cruft removal
Diffstat (limited to 'rts')
| -rw-r--r-- | rts/RaiseAsync.c | 3 | ||||
| -rw-r--r-- | rts/ThreadPaused.c | 2 | ||||
| -rw-r--r-- | rts/Updates.h | 21 |
3 files changed, 2 insertions, 24 deletions
diff --git a/rts/RaiseAsync.c b/rts/RaiseAsync.c index ce0e555e5f..501da2f55f 100644 --- a/rts/RaiseAsync.c +++ b/rts/RaiseAsync.c @@ -811,8 +811,7 @@ raiseAsync(Capability *cap, StgTSO *tso, StgClosure *exception, // Perform the update // TODO: this may waste some work, if the thunk has // already been updated by another thread. - UPD_IND_NOLOCK(((StgUpdateFrame *)frame)->updatee, - (StgClosure *)ap); + UPD_IND(((StgUpdateFrame *)frame)->updatee, (StgClosure *)ap); } sp += sizeofW(StgUpdateFrame) - 1; diff --git a/rts/ThreadPaused.c b/rts/ThreadPaused.c index 2a3f355996..4882ab2374 100644 --- a/rts/ThreadPaused.c +++ b/rts/ThreadPaused.c @@ -74,7 +74,7 @@ stackSqueeze(StgTSO *tso, StgPtr bottom) * screw us up if we don't check. */ if (upd->updatee != updatee && !closure_IND(upd->updatee)) { - UPD_IND_NOLOCK(upd->updatee, updatee); + UPD_IND(upd->updatee, updatee); } // now mark this update frame as a stack gap. The gap diff --git a/rts/Updates.h b/rts/Updates.h index c04005b49b..98e9e5a553 100644 --- a/rts/Updates.h +++ b/rts/Updates.h @@ -35,19 +35,13 @@ #ifdef CMINUSMINUS #define BLOCK_BEGIN #define BLOCK_END -#define DECLARE_IPTR(info) W_ info -#define FCALL foreign "C" #define INFO_PTR(info) info -#define ARG_PTR "ptr" #else #define BLOCK_BEGIN { #define BLOCK_END } -#define DECLARE_IPTR(info) const StgInfoTable *(info) -#define FCALL /* nothing */ #define INFO_PTR(info) &info #define StgBlockingQueue_blocking_queue(closure) \ (((StgBlockingQueue *)closure)->blocking_queue) -#define ARG_PTR /* nothing */ #endif /* krc: there used to be an UPD_REAL_IND and an @@ -56,27 +50,12 @@ for now, we just have UPD_REAL_IND. */ #define UPD_REAL_IND(updclosure, ind_info, heapptr, and_then) \ BLOCK_BEGIN \ - DECLARE_IPTR(info); \ - info = GET_INFO(updclosure); \ updateWithIndirection(ind_info, \ updclosure, \ heapptr, \ and_then); \ BLOCK_END -#if defined(RTS_SUPPORTS_THREADS) - -# define UPD_IND_NOLOCK(updclosure, heapptr) \ - BLOCK_BEGIN \ - updateWithIndirection(INFO_PTR(stg_IND_info), \ - updclosure, \ - heapptr,); \ - BLOCK_END - -#else -#define UPD_IND_NOLOCK(updclosure,heapptr) UPD_IND(updclosure,heapptr) -#endif /* RTS_SUPPORTS_THREADS */ - /* ----------------------------------------------------------------------------- Awaken any threads waiting on a blocking queue (BLACKHOLE_BQ). -------------------------------------------------------------------------- */ |