X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Frts%2FRtsAPI.c;h=d79da3d18063a85b06e4e8c5a3914f7d48874e36;hb=f5e2a3790c3bf6de8eda68e44efe4a2fdce310e7;hp=651a497fdfb07a5edd7313c449b055fb9f132436;hpb=85aa72b9dc6803685595936c61f3cab6faab815a;p=ghc-hetmet.git

diff --git a/ghc/rts/RtsAPI.c b/ghc/rts/RtsAPI.c
index 651a497..d79da3d 100644
--- a/ghc/rts/RtsAPI.c
+++ b/ghc/rts/RtsAPI.c
@@ -1,5 +1,5 @@
 /* ----------------------------------------------------------------------------
- * $Id: RtsAPI.c,v 1.46 2003/09/21 22:20:56 wolfgang Exp $
+ * $Id: RtsAPI.c,v 1.51 2003/12/17 12:17:18 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2001
  *
@@ -76,10 +76,10 @@ rts_mkInt32 (HsInt32 i)
 HaskellObj
 rts_mkInt64 (HsInt64 i)
 {
-  long long *tmp;
+  llong *tmp;
   StgClosure *p = (StgClosure *)allocate(CONSTR_sizeW(0,2));
   SET_HDR(p, I64zh_con_info, CCS_SYSTEM);
-  tmp  = (long long*)&(p->payload[0]);
+  tmp  = (llong*)&(p->payload[0]);
   *tmp = (StgInt64)i;
   return p;
 }
@@ -126,12 +126,12 @@ rts_mkWord32 (HsWord32 w)
 HaskellObj
 rts_mkWord64 (HsWord64 w)
 {
-  unsigned long long *tmp;
+  ullong *tmp;
 
   StgClosure *p = (StgClosure *)allocate(CONSTR_sizeW(0,2));
   /* see mk_Int8 comment */
   SET_HDR(p, W64zh_con_info, CCS_SYSTEM);
-  tmp  = (unsigned long long*)&(p->payload[0]);
+  tmp  = (ullong*)&(p->payload[0]);
   *tmp = (StgWord64)w;
   return p;
 }
@@ -369,13 +369,14 @@ rts_getFunPtr (HaskellObj p)
 HsBool
 rts_getBool (HaskellObj p)
 {
-  if (p == True_closure) {
-    return 1;
-  } else if (p == False_closure) {
-    return 0;
-  } else {
-    barf("rts_getBool: not a Bool");
-  }
+    StgInfoTable *info;
+
+    info = get_itbl((StgClosure *)p);
+    if (info->srt_bitmap == 0) { // srt_bitmap is the constructor tag
+	return 0;
+    } else {
+	return 1;
+    }
 }
 
 /* ----------------------------------------------------------------------------
@@ -385,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);
 }
 
 /*
@@ -407,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);
 }
 
 /*
@@ -428,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);
@@ -444,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. */
@@ -482,19 +494,13 @@ void
 rts_lock()
 {
 #ifdef RTS_SUPPORTS_THREADS
-	ACQUIRE_LOCK(&sched_mutex);
-	
-		// we request to get the capability immediately, in order to
-		// a) stop other threads from using allocate()
-		// b) wake the current worker thread from awaitEvent()
-		//       (so that a thread started by rts_eval* will start immediately)
-	grabReturnCapability(&sched_mutex,&rtsApiCapability);
+    ACQUIRE_LOCK(&sched_mutex);
 	
-		// In the RTS hasn't been entered yet,
-		// start a RTS task.
-		// If there is already a task available (waiting for the work capability),
-		// this will do nothing.
-	startSchedulerTask();
+    // we request to get the capability immediately, in order to
+    // a) stop other threads from using allocate()
+    // b) wake the current worker thread from awaitEvent()
+    //       (so that a thread started by rts_eval* will start immediately)
+    waitForReturnCapability(&sched_mutex,&rtsApiCapability);
 #endif
 }
 
@@ -502,7 +508,10 @@ void
 rts_unlock()
 {
 #ifdef RTS_SUPPORTS_THREADS
-	rtsApiCapability = NULL;
-	RELEASE_LOCK(&sched_mutex);
+    if (rtsApiCapability) {
+	releaseCapability(rtsApiCapability);
+    }
+    rtsApiCapability = NULL;
+    RELEASE_LOCK(&sched_mutex);
 #endif
 }