From aefc6956f4828708e1343cf4858296fc3141a176 Mon Sep 17 00:00:00 2001
From: wolfgang <unknown>
Date: Wed, 1 Oct 2003 10:36:49 +0000
Subject: [PATCH] [project @ 2003-10-01 10:36:49 by wolfgang] Make sure that
 the sequence rts_lock(); rts_unlock(); /* (with nothing in
 between) */ doesn't crash the threaded RTS.

---
 ghc/rts/RtsAPI.c |   29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/ghc/rts/RtsAPI.c b/ghc/rts/RtsAPI.c
index 32a7a32..835db72 100644
--- a/ghc/rts/RtsAPI.c
+++ b/ghc/rts/RtsAPI.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: RtsAPI.c,v 1.47 2003/10/01 09:08:10 simonmar Exp $
+ * $Id: RtsAPI.c,v 1.48 2003/10/01 10:36:49 wolfgang Exp $
  *
  * (c) The GHC Team, 1998-2001
  *
@@ -386,18 +386,22 @@ SchedulerStatus
 rts_eval (HaskellObj p, /*out*/HaskellObj *ret)
 {
     StgTSO *tso;
+    Capability *cap = rtsApiCapability;
+    rtsApiCapability = NULL;
 
     tso = createGenThread(RtsFlags.GcFlags.initialStkSize, p);
-    return scheduleWaitThread(tso,ret,rtsApiCapability);
+    return scheduleWaitThread(tso,ret,cap);
 }
 
 SchedulerStatus
 rts_eval_ (HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret)
 {
     StgTSO *tso;
+    Capability *cap = rtsApiCapability;
+    rtsApiCapability = NULL;
     
     tso = createGenThread(stack_size, p);
-    return scheduleWaitThread(tso,ret,rtsApiCapability);
+    return scheduleWaitThread(tso,ret,cap);
 }
 
 /*
@@ -408,9 +412,11 @@ SchedulerStatus
 rts_evalIO (HaskellObj p, /*out*/HaskellObj *ret)
 {
     StgTSO* tso; 
+    Capability *cap = rtsApiCapability;
+    rtsApiCapability = NULL;
     
     tso = createStrictIOThread(RtsFlags.GcFlags.initialStkSize, p);
-    return scheduleWaitThread(tso,ret,rtsApiCapability);
+    return scheduleWaitThread(tso,ret,cap);
 }
 
 /*
@@ -429,6 +435,7 @@ rts_evalStableIO (HsStablePtr s, /*out*/HsStablePtr *ret)
     p = (StgClosure *)deRefStablePtr(s);
     tso = createStrictIOThread(RtsFlags.GcFlags.initialStkSize, p);
     stat = scheduleWaitThread(tso,&r,rtsApiCapability);
+    rtsApiCapability = NULL;
 
     if (stat == Success && ret != NULL) {
 	ASSERT(r != NULL);
@@ -445,18 +452,22 @@ SchedulerStatus
 rts_evalLazyIO (HaskellObj p, /*out*/HaskellObj *ret)
 {
     StgTSO *tso;
+    Capability *cap = rtsApiCapability;
+    rtsApiCapability = NULL;
 
     tso = createIOThread(RtsFlags.GcFlags.initialStkSize, p);
-    return scheduleWaitThread(tso,ret,rtsApiCapability);
+    return scheduleWaitThread(tso,ret,cap);
 }
 
 SchedulerStatus
 rts_evalLazyIO_ (HaskellObj p, unsigned int stack_size, /*out*/HaskellObj *ret)
 {
     StgTSO *tso;
+    Capability *cap = rtsApiCapability;
+    rtsApiCapability = NULL;
 
     tso = createIOThread(stack_size, p);
-    return scheduleWaitThread(tso,ret,rtsApiCapability);
+    return scheduleWaitThread(tso,ret,cap);
 }
 
 /* Convenience function for decoding the returned status. */
@@ -503,7 +514,9 @@ void
 rts_unlock()
 {
 #ifdef RTS_SUPPORTS_THREADS
-	rtsApiCapability = NULL;
-	RELEASE_LOCK(&sched_mutex);
+    if(rtsApiCapability)
+	releaseCapability(rtsApiCapability);
+    rtsApiCapability = NULL;
+    RELEASE_LOCK(&sched_mutex);
 #endif
 }
-- 
1.7.10.4