#include "PosixSource.h"
#include "Rts.h"
+#include "OSThreads.h"
#include "Storage.h"
#include "RtsAPI.h"
#include "SchedAPI.h"
#include "RtsFlags.h"
#include "RtsUtils.h"
#include "Prelude.h"
-#include "OSThreads.h"
#include "Schedule.h"
#include "Capability.h"
HaskellObj
rts_apply (HaskellObj f, HaskellObj arg)
{
- StgClosure *ap;
+ StgThunk *ap;
- ap = (StgClosure *)allocate(sizeofW(StgClosure) + 2);
+ ap = (StgThunk *)allocate(sizeofW(StgThunk) + 2);
SET_HDR(ap, (StgInfoTable *)&stg_ap_2_upd_info, CCS_SYSTEM);
ap->payload[0] = f;
ap->payload[1] = arg;
StgTSO* tso;
StgClosure *p, *r;
SchedulerStatus stat;
+ Capability *cap = rtsApiCapability;
+ rtsApiCapability = NULL;
p = (StgClosure *)deRefStablePtr(s);
tso = createStrictIOThread(RtsFlags.GcFlags.initialStkSize, p);
- stat = scheduleWaitThread(tso,&r,rtsApiCapability);
- rtsApiCapability = NULL;
+ stat = scheduleWaitThread(tso,&r,cap);
if (stat == Success && ret != NULL) {
ASSERT(r != NULL);
// b) wake the current worker thread from awaitEvent()
// (so that a thread started by rts_eval* will start immediately)
waitForReturnCapability(&sched_mutex,&rtsApiCapability);
+#else
+ grabCapability(&rtsApiCapability);
#endif
}