/* ----------------------------------------------------------------------------
- * $Id: RtsAPI.c,v 1.47 2003/10/01 09:08:10 simonmar Exp $
*
* (c) The GHC Team, 1998-2001
*
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;
}
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;
}
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);
}
/*
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);
}
/*
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);
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. */
case Success:
return;
case Killed:
- prog_belch("%s: uncaught exception",site);
+ errorBelch("%s: uncaught exception",site);
stg_exit(EXIT_FAILURE);
case Interrupted:
- prog_belch("%s: interrupted", site);
+ errorBelch("%s: interrupted", site);
stg_exit(EXIT_FAILURE);
default:
- prog_belch("%s: Return code (%d) not ok",(site),(rc));
+ errorBelch("%s: Return code (%d) not ok",(site),(rc));
stg_exit(EXIT_FAILURE);
}
}
rts_lock()
{
#ifdef RTS_SUPPORTS_THREADS
- ACQUIRE_LOCK(&sched_mutex);
+ 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);
-
- // 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
}
rts_unlock()
{
#ifdef RTS_SUPPORTS_THREADS
- rtsApiCapability = NULL;
- RELEASE_LOCK(&sched_mutex);
+ if (rtsApiCapability) {
+ releaseCapability(rtsApiCapability);
+ }
+ rtsApiCapability = NULL;
+ RELEASE_LOCK(&sched_mutex);
#endif
}