projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Share some work in MkIface
[ghc-hetmet.git]
/
rts
/
Capability.h
diff --git
a/rts/Capability.h
b/rts/Capability.h
index
59da4a8
..
d580a83
100644
(file)
--- a/
rts/Capability.h
+++ b/
rts/Capability.h
@@
-25,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
@@
-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;
@@
-98,8
+99,10
@@
struct Capability_ {
// Stats on spark creation/conversion
nat sparks_created;
// Stats on spark creation/conversion
nat sparks_created;
+ nat sparks_dud;
nat sparks_converted;
nat sparks_converted;
- nat sparks_pruned;
+ nat sparks_gcd;
+ nat sparks_fizzled;
#endif
// Per-capability STM-related data
#endif
// Per-capability STM-related data
@@
-275,9
+278,11
@@
INLINE_HEADER void contextSwitchCapability(Capability *cap);
void freeCapabilities (void);
// For the GC:
void freeCapabilities (void);
// For the GC:
-void markSomeCapabilities (evac_fn evac, void *user, nat i0, nat delta,
- rtsBool no_mark_sparks);
+void markCapability (evac_fn evac, void *user, Capability *cap,
+ rtsBool no_mark_sparks USED_IF_THREADS);
+
void markCapabilities (evac_fn evac, void *user);
void markCapabilities (evac_fn evac, void *user);
+
void traverseSparkQueues (evac_fn evac, void *user);
/* -----------------------------------------------------------------------------
void traverseSparkQueues (evac_fn evac, void *user);
/* -----------------------------------------------------------------------------
@@
-357,6
+362,6
@@
INLINE_HEADER rtsBool emptyInbox(Capability *cap)
#endif
#endif
-END_RTS_PRIVATE
+#include "EndPrivate.h"
#endif /* CAPABILITY_H */
#endif /* CAPABILITY_H */