diff options
| author | Simon Marlow <marlowsd@gmail.com> | 2014-05-04 20:27:42 +0100 |
|---|---|---|
| committer | Simon Marlow <marlowsd@gmail.com> | 2014-05-04 20:28:58 +0100 |
| commit | f0fcc41d755876a1b02d1c7c79f57515059f6417 (patch) | |
| tree | 89cce0cfc61744b1c7b732619ea9de04f21fdcfe /rts/HeapStackCheck.cmm | |
| parent | 5141baf76132fe0d8f88cfa0a62698cc3b37e48a (diff) | |
| download | haskell-f0fcc41d755876a1b02d1c7c79f57515059f6417.tar.gz | |
Revert "Per-thread allocation counters and limits"
Problems were found on 32-bit platforms, I'll commit again when I have a fix.
This reverts the following commits:
54b31f744848da872c7c6366dea840748e01b5cf
b0534f78a73f972e279eed4447a5687bd6a8308e
Diffstat (limited to 'rts/HeapStackCheck.cmm')
| -rw-r--r-- | rts/HeapStackCheck.cmm | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/rts/HeapStackCheck.cmm b/rts/HeapStackCheck.cmm index 280820334a..12bcfb26df 100644 --- a/rts/HeapStackCheck.cmm +++ b/rts/HeapStackCheck.cmm @@ -100,9 +100,7 @@ stg_gc_noregs CurrentNursery = bdescr_link(CurrentNursery); OPEN_NURSERY(); if (Capability_context_switch(MyCapability()) != 0 :: CInt || - Capability_interrupt(MyCapability()) != 0 :: CInt || - (StgTSO_alloc_limit(CurrentTSO) `lt` 0 && - (TO_W_(StgTSO_flags(CurrentTSO)) & TSO_ALLOC_LIMIT) != 0)) { + Capability_interrupt(MyCapability()) != 0 :: CInt) { ret = ThreadYielding; goto sched; } else { |