diff options
author | simonmar <unknown> | 2005-10-21 14:02:18 +0000 |
---|---|---|
committer | simonmar <unknown> | 2005-10-21 14:02:18 +0000 |
commit | 03a9ff01812afc81eb5236fd3063cbec44cf469e (patch) | |
tree | e02ce9ff95e7ed47b811ec2014fa43027d9a175f /ghc/rts/StgMiscClosures.cmm | |
parent | 63e8af080a7e779a48e812e6caa9ea519b046260 (diff) | |
download | haskell-03a9ff01812afc81eb5236fd3063cbec44cf469e.tar.gz |
[project @ 2005-10-21 14:02:17 by simonmar]
Big re-hash of the threaded/SMP runtime
This is a significant reworking of the threaded and SMP parts of
the runtime. There are two overall goals here:
- To push down the scheduler lock, reducing contention and allowing
more parts of the system to run without locks. In particular,
the scheduler does not require a lock any more in the common case.
- To improve affinity, so that running Haskell threads stick to the
same OS threads as much as possible.
At this point we have the basic structure working, but there are some
pieces missing. I believe it's reasonably stable - the important
parts of the testsuite pass in all the (normal,threaded,SMP) ways.
In more detail:
- Each capability now has a run queue, instead of one global run
queue. The Capability and Task APIs have been completely
rewritten; see Capability.h and Task.h for the details.
- Each capability has its own pool of worker Tasks. Hence, Haskell
threads on a Capability's run queue will run on the same worker
Task(s). As long as the OS is doing something reasonable, this
should mean they usually stick to the same CPU. Another way to
look at this is that we're assuming each Capability is associated
with a fixed CPU.
- What used to be StgMainThread is now part of the Task structure.
Every OS thread in the runtime has an associated Task, and it
can ask for its current Task at any time with myTask().
- removed RTS_SUPPORTS_THREADS symbol, use THREADED_RTS instead
(it is now defined for SMP too).
- The RtsAPI has had to change; we must explicitly pass a Capability
around now. The previous interface assumed some global state.
SchedAPI has also changed a lot.
- The OSThreads API now supports thread-local storage, used to
implement myTask(), although it could be done more efficiently
using gcc's __thread extension when available.
- I've moved some POSIX-specific stuff into the posix subdirectory,
moving in the direction of separating out platform-specific
implementations.
- lots of lock-debugging and assertions in the runtime. In particular,
when DEBUG is on, we catch multiple ACQUIRE_LOCK()s, and there is
also an ASSERT_LOCK_HELD() call.
What's missing so far:
- I have almost certainly broken the Win32 build, will fix soon.
- any kind of thread migration or load balancing. This is high up
the agenda, though.
- various performance tweaks to do
- throwTo and forkProcess still do not work in SMP mode
Diffstat (limited to 'ghc/rts/StgMiscClosures.cmm')
-rw-r--r-- | ghc/rts/StgMiscClosures.cmm | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ghc/rts/StgMiscClosures.cmm b/ghc/rts/StgMiscClosures.cmm index 72c5824be6..628e0f123c 100644 --- a/ghc/rts/StgMiscClosures.cmm +++ b/ghc/rts/StgMiscClosures.cmm @@ -338,6 +338,10 @@ INFO_TABLE(stg_BLACKHOLE,0,1,BLACKHOLE,"BLACKHOLE","BLACKHOLE") TICK_ENT_BH(); +#ifdef SMP + // foreign "C" debugBelch("BLACKHOLE entry\n"); +#endif + /* Actually this is not necessary because R1 is about to be destroyed. */ LDV_ENTER(R1); @@ -403,6 +407,10 @@ INFO_TABLE(stg_CAF_BLACKHOLE,0,1,CAF_BLACKHOLE,"CAF_BLACKHOLE","CAF_BLACKHOLE") LDV_ENTER(R1); #if defined(SMP) + // foreign "C" debugBelch("BLACKHOLE entry\n"); +#endif + +#if defined(SMP) foreign "C" ACQUIRE_LOCK(sched_mutex "ptr"); // released in stg_block_blackhole_finally #endif |