projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Acutally, wild-card variables *can* have occurrences
[ghc-hetmet.git]
/
rts
/
Capability.h
diff --git
a/rts/Capability.h
b/rts/Capability.h
index
ff6e368
..
a15ce15
100644
(file)
--- a/
rts/Capability.h
+++ b/
rts/Capability.h
@@
-4,6
+4,9
@@
*
* Capabilities
*
*
* Capabilities
*
+ * For details on the high-level design, see
+ * http://hackage.haskell.org/trac/ghc/wiki/Commentary/Rts/Scheduler
+ *
* A Capability holds all the state an OS thread/task needs to run
* Haskell code: its STG registers, a pointer to its TSO, a nursery
* etc. During STG execution, a pointer to the Capabilitity is kept in
* A Capability holds all the state an OS thread/task needs to run
* Haskell code: its STG registers, a pointer to its TSO, a nursery
* etc. During STG execution, a pointer to the Capabilitity is kept in
@@
-22,7
+25,7
@@
#include "Task.h"
#include "Sparks.h"
#include "Task.h"
#include "Sparks.h"
-BEGIN_RTS_PRIVATE
+#include "BeginPrivate.h"
struct Capability_ {
// State required by the STG virtual machine when running Haskell
struct Capability_ {
// State required by the STG virtual machine when running Haskell
@@
-43,9
+46,6
@@
struct Capability_ {
// catching unsafe call-ins.
rtsBool in_haskell;
// catching unsafe call-ins.
rtsBool in_haskell;
- // true if this Capability is currently in the GC
- rtsBool in_gc;
-
// The run queue. The Task owning this Capability has exclusive
// access to its run queue, so can wake up threads without
// taking a lock, and the common path through the scheduler is
// The run queue. The Task owning this Capability has exclusive
// access to its run queue, so can wake up threads without
// taking a lock, and the common path through the scheduler is
@@
-59,7
+59,7
@@
struct Capability_ {
// the suspended TSOs easily. Hence, when migrating a Task from
// the returning_tasks list, we must also migrate its entry from
// this list.
// the suspended TSOs easily. Hence, when migrating a Task from
// the returning_tasks list, we must also migrate its entry from
// this list.
- Task *suspended_ccalling_tasks;
+ InCall *suspended_ccalls;
// One mutable list per generation, so we don't need to take any
// locks when updating an old-generation thunk. This also lets us
// One mutable list per generation, so we don't need to take any
// locks when updating an old-generation thunk. This also lets us
@@
-79,6
+79,7
@@
struct Capability_ {
#if defined(THREADED_RTS)
// Worker Tasks waiting in the wings. Singly-linked.
Task *spare_workers;
#if defined(THREADED_RTS)
// Worker Tasks waiting in the wings. Singly-linked.
Task *spare_workers;
+ nat n_spare_workers; // count of above
// This lock protects running_task, returning_tasks_{hd,tl}, wakeup_queue.
Mutex lock;
// This lock protects running_task, returning_tasks_{hd,tl}, wakeup_queue.
Mutex lock;
@@
-91,11
+92,8
@@
struct Capability_ {
Task *returning_tasks_hd; // Singly-linked, with head/tail
Task *returning_tasks_tl;
Task *returning_tasks_hd; // Singly-linked, with head/tail
Task *returning_tasks_tl;
- // A list of threads to append to this Capability's run queue at
- // the earliest opportunity. These are threads that have been
- // woken up by another Capability.
- StgTSO *wakeup_queue_hd;
- StgTSO *wakeup_queue_tl;
+ // Messages, or END_TSO_QUEUE.
+ Message *inbox;
SparkPool *sparks;
SparkPool *sparks;
@@
-205,7
+203,9
@@
extern volatile StgWord waiting_for_gc;
//
void waitForReturnCapability (Capability **cap/*in/out*/, Task *task);
//
void waitForReturnCapability (Capability **cap/*in/out*/, Task *task);
-INLINE_HEADER void recordMutableCap (StgClosure *p, Capability *cap, nat gen);
+EXTERN_INLINE void recordMutableCap (StgClosure *p, Capability *cap, nat gen);
+
+EXTERN_INLINE void recordClosureMutated (Capability *cap, StgClosure *p);
#if defined(THREADED_RTS)
#if defined(THREADED_RTS)
@@
-228,12
+228,6
@@
void yieldCapability (Capability** pCap, Task *task);
//
void waitForCapability (Task *task, Mutex *mutex, Capability **pCap);
//
void waitForCapability (Task *task, Mutex *mutex, Capability **pCap);
-// Wakes up a thread on a Capability (probably a different Capability
-// from the one held by the current Task).
-//
-void wakeupThreadOnCapability (Capability *my_cap, Capability *other_cap,
- StgTSO *tso);
-
// Wakes up a worker thread on just one Capability, used when we
// need to service some global event.
//
// Wakes up a worker thread on just one Capability, used when we
// need to service some global event.
//
@@
-283,21
+277,32
@@
void freeCapabilities (void);
// For the GC:
void markSomeCapabilities (evac_fn evac, void *user, nat i0, nat delta,
// For the GC:
void markSomeCapabilities (evac_fn evac, void *user, nat i0, nat delta,
- rtsBool prune_sparks);
+ rtsBool no_mark_sparks);
void markCapabilities (evac_fn evac, void *user);
void traverseSparkQueues (evac_fn evac, void *user);
/* -----------------------------------------------------------------------------
void markCapabilities (evac_fn evac, void *user);
void traverseSparkQueues (evac_fn evac, void *user);
/* -----------------------------------------------------------------------------
+ Messages
+ -------------------------------------------------------------------------- */
+
+#ifdef THREADED_RTS
+
+INLINE_HEADER rtsBool emptyInbox(Capability *cap);;
+
+#endif // THREADED_RTS
+
+/* -----------------------------------------------------------------------------
* INLINE functions... private below here
* -------------------------------------------------------------------------- */
* INLINE functions... private below here
* -------------------------------------------------------------------------- */
-INLINE_HEADER void
+EXTERN_INLINE void
recordMutableCap (StgClosure *p, Capability *cap, nat gen)
{
bdescr *bd;
// We must own this Capability in order to modify its mutable list.
recordMutableCap (StgClosure *p, Capability *cap, nat gen)
{
bdescr *bd;
// We must own this Capability in order to modify its mutable list.
- ASSERT(cap->running_task == myTask());
+ // ASSERT(cap->running_task == myTask());
+ // NO: assertion is violated by performPendingThrowTos()
bd = cap->mut_lists[gen];
if (bd->free >= bd->start + BLOCK_SIZE_W) {
bdescr *new_bd;
bd = cap->mut_lists[gen];
if (bd->free >= bd->start + BLOCK_SIZE_W) {
bdescr *new_bd;
@@
-309,6
+314,15
@@
recordMutableCap (StgClosure *p, Capability *cap, nat gen)
*bd->free++ = (StgWord)p;
}
*bd->free++ = (StgWord)p;
}
+EXTERN_INLINE void
+recordClosureMutated (Capability *cap, StgClosure *p)
+{
+ bdescr *bd;
+ bd = Bdescr((StgPtr)p);
+ if (bd->gen_no != 0) recordMutableCap(p,cap,bd->gen_no);
+}
+
+
#if defined(THREADED_RTS)
INLINE_HEADER rtsBool
emptySparkPoolCap (Capability *cap)
#if defined(THREADED_RTS)
INLINE_HEADER rtsBool
emptySparkPoolCap (Capability *cap)
@@
-335,6
+349,15
@@
contextSwitchCapability (Capability *cap)
cap->context_switch = 1;
}
cap->context_switch = 1;
}
-END_RTS_PRIVATE
+#ifdef THREADED_RTS
+
+INLINE_HEADER rtsBool emptyInbox(Capability *cap)
+{
+ return (cap->inbox == (Message*)END_TSO_QUEUE);
+}
+
+#endif
+
+#include "EndPrivate.h"
#endif /* CAPABILITY_H */
#endif /* CAPABILITY_H */