X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2FCapability.h;h=2daade8d60d875e6f7758eafe40f5006e6710e64;hb=26f4bfc82f2b2359259578e9c54d476fc2de650f;hp=59da4a88fae2e2345a259b9d4104109b45c72f8e;hpb=f9ce05ef56187d981b5d1af51e3f53fc6f202d5b;p=ghc-hetmet.git diff --git a/rts/Capability.h b/rts/Capability.h index 59da4a8..2daade8 100644 --- a/rts/Capability.h +++ b/rts/Capability.h @@ -25,7 +25,7 @@ #include "Task.h" #include "Sparks.h" -BEGIN_RTS_PRIVATE +#include "BeginPrivate.h" 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; + nat n_spare_workers; // count of above // 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; + nat sparks_dud; nat sparks_converted; - nat sparks_pruned; + nat sparks_gcd; + nat sparks_fizzled; #endif // Per-capability STM-related data @@ -357,6 +360,6 @@ INLINE_HEADER rtsBool emptyInbox(Capability *cap) #endif -END_RTS_PRIVATE +#include "EndPrivate.h" #endif /* CAPABILITY_H */