projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use StgWord64 instead of ullong
[ghc-hetmet.git]
/
rts
/
Capability.h
diff --git
a/rts/Capability.h
b/rts/Capability.h
index
4030b5e
..
d8eba0d
100644
(file)
--- a/
rts/Capability.h
+++ b/
rts/Capability.h
@@
-199,7
+199,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)
@@
-222,12
+224,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.
//
@@
-289,15
+285,13
@@
void traverseSparkQueues (evac_fn evac, void *user);
INLINE_HEADER rtsBool emptyInbox(Capability *cap);;
INLINE_HEADER rtsBool emptyInbox(Capability *cap);;
-void sendMessage (Capability *cap, Message *msg);
-
#endif // THREADED_RTS
/* -----------------------------------------------------------------------------
* INLINE functions... private below here
* -------------------------------------------------------------------------- */
#endif // THREADED_RTS
/* -----------------------------------------------------------------------------
* INLINE functions... private below here
* -------------------------------------------------------------------------- */
-INLINE_HEADER void
+EXTERN_INLINE void
recordMutableCap (StgClosure *p, Capability *cap, nat gen)
{
bdescr *bd;
recordMutableCap (StgClosure *p, Capability *cap, nat gen)
{
bdescr *bd;
@@
-316,6
+310,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)