From: simonmar <unknown>
Date: Wed, 26 Oct 2005 15:20:59 +0000 (+0000)
Subject: [project @ 2005-10-26 15:20:59 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~122
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;ds=sidebyside;h=05fa98679efbc6d611d27a8b1079de83fc6efd93;p=ghc-hetmet.git

[project @ 2005-10-26 15:20:59 by simonmar]
- forkProcess fix: add a forgotten rts_unlock()
- add a couple more ASSERTs
---

diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index a7696ed..7af3ab5 100644
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -1934,6 +1934,7 @@ forkProcess(HsStablePtr *entry
     if (pid) { // parent
 	
 	// just return the pid
+	rts_unlock(cap);
 	return pid;
 	
     } else { // child
@@ -2462,6 +2463,8 @@ scheduleWaitThread (StgTSO* tso, /*[out]*/HaskellObj* ret, Capability *cap)
     cap = schedule(cap,task);
 
     ASSERT(task->stat != NoStatus);
+    ASSERT(cap->running_task == task);
+    ASSERT(task->cap == cap);
 
     IF_DEBUG(scheduler, sched_belch("bound thread (%d) finished", task->tso->id));
     return cap;