[project @ 1999-11-02 15:05:38 by simonmar]

This commit adds in the current state of our SMP support.  Notably,
this allows the new way 's' to be built, providing support for running
multiple Haskell threads simultaneously on top of any pthreads
implementation, the idea being to take advantage of commodity SMP
boxes.

Don't expect to get much of a speedup yet; due to the excessive
locking required to synchronise access to mutable heap objects, you'll
see a slowdown in most cases, even on a UP machine.  The best I've
seen is a 1.6-1.7 speedup on an example that did no locking (two
optimised nfibs in parallel).

	- new RTS -N flag specifies how many pthreads to start.

	- new driver -smp flag, tells the driver to use way 's'.

	- new compiler -fsmp option (not for user comsumption)
	  tells the compiler not to generate direct jumps to
	  thunk entry code.

	- largely rewritten scheduler

	- _ccall_GC is now done by handing back a "token" to the
	  RTS before executing the ccall; it should now be possible
	  to execute blocking ccalls in the current thread while
	  allowing the RTS to continue running Haskell threads as
	  normal.

	- you can only call thread-safe C libraries from a way 's'
	  build, of course.

Pthread support is still incomplete, and weird things (including
deadlocks) are likely to happen.

1 files changed, 9 insertions, 4 deletions

diff --git a/ghc/compiler/codeGen/CgClosure.lhs b/ghc/compiler/codeGen/CgClosure.lhs
index dc326087c9..38c88dd999 100644
--- a/ghc/compiler/codeGen/CgClosure.lhs
+++ b/ghc/compiler/codeGen/CgClosure.lhs
@@ -1,7 +1,7 @@
 %
 % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 %
-% $Id: CgClosure.lhs,v 1.36 1999/11/01 17:10:07 simonpj Exp $
+% $Id: CgClosure.lhs,v 1.37 1999/11/02 15:05:43 simonmar Exp $
 %
 \section[CgClosure]{Code generation for closures}
 
@@ -269,6 +269,7 @@ closureCodeBody binder_info closure_info cc [] body
     cl_descr mod_name = closureDescription mod_name (closureName closure_info)
 
     body_label   = entryLabelFromCI closure_info
+    
     is_box  = case body of { StgApp fun [] -> True; _ -> False }
 
     body_code   = profCtrC SLIT("TICK_ENT_THK") []		`thenC`
@@ -577,7 +578,7 @@ thunkWrapper closure_info lbl thunk_code
     thunkChecks lbl node_points (
 
 	-- Overwrite with black hole if necessary
-    blackHoleIt closure_info node_points	`thenC`
+    blackHoleIt closure_info node_points  `thenC`
 
     setupUpdate closure_info (			-- setupUpdate *encloses* the rest
 
@@ -624,10 +625,14 @@ blackHoleIt :: ClosureInfo -> Bool -> Code	-- Only called for closures with no a
 blackHoleIt closure_info node_points
   = if blackHoleOnEntry closure_info && node_points
     then
+	let
+	  info_label = infoTableLabelFromCI closure_info
+	  args = [ CLbl info_label DataPtrRep ]
+	in
 	absC (if closureSingleEntry(closure_info) then
-		CMacroStmt UPD_BH_SINGLE_ENTRY [CReg node]
+		CMacroStmt UPD_BH_SINGLE_ENTRY args
 	      else
-		CMacroStmt UPD_BH_UPDATABLE [CReg node])
+		CMacroStmt UPD_BH_UPDATABLE args)
     else
 	nopC
 \end{code}