diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2014-10-15 00:03:15 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2014-11-12 15:11:10 +0000 |
| commit | d70b19bfb5ed79b22c2ac31e22f46782fc47a117 (patch) | |
| tree | d7bc2ad5a6d50bf351dfd97779030dae63e5d7cf /rts/Capability.c | |
| parent | c774b28f76ee4c220f7c1c9fd81585e0e3af0e8a (diff) | |
| download | haskell-d70b19bfb5ed79b22c2ac31e22f46782fc47a117.tar.gz | |
Per-thread allocation counters and limits
This reverts commit f0fcc41d755876a1b02d1c7c79f57515059f6417.
New changes: now works on 32-bit platforms too. I added some basic
support for 64-bit subtraction and comparison operations to the x86
NCG.
Diffstat (limited to 'rts/Capability.c')
| -rw-r--r-- | rts/Capability.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/rts/Capability.c b/rts/Capability.c index 289eeb2c5b..21f63f39d9 100644 --- a/rts/Capability.c +++ b/rts/Capability.c @@ -297,6 +297,10 @@ initCapability( Capability *cap, nat i ) cap->r.rCCCS = NULL; #endif + // cap->r.rCurrentTSO is charged for calls to allocate(), so we + // don't want it set when not running a Haskell thread. + cap->r.rCurrentTSO = NULL; + traceCapCreate(cap); traceCapsetAssignCap(CAPSET_OSPROCESS_DEFAULT, i); traceCapsetAssignCap(CAPSET_CLOCKDOMAIN_DEFAULT, i); |