diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-10-26 23:57:58 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-10-26 23:57:58 +0000 |
| commit | d8f412571f8768df2d3239e72392dfeabbad1559 (patch) | |
| tree | 19d182df05ead7ff8ba7ee00a7d57555e1383fdf /libgo/runtime/mheap.c | |
| parent | e0c39d66d4f0607177b1cf8995dda56a667e07b3 (diff) | |
| download | gcc-d8f412571f8768df2d3239e72392dfeabbad1559.zip gcc-d8f412571f8768df2d3239e72392dfeabbad1559.tar.gz gcc-d8f412571f8768df2d3239e72392dfeabbad1559.tar.bz2 | |
Update Go library to last weekly.
From-SVN: r180552
Diffstat (limited to 'libgo/runtime/mheap.c')
| -rw-r--r-- | libgo/runtime/mheap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libgo/runtime/mheap.c b/libgo/runtime/mheap.c index cacac7d..a49b405 100644 --- a/libgo/runtime/mheap.c +++ b/libgo/runtime/mheap.c @@ -13,6 +13,7 @@ // and heapmap(i) == span for all s->start <= i < s->start+s->npages. #include "runtime.h" +#include "arch.h" #include "malloc.h" static MSpan *MHeap_AllocLocked(MHeap*, uintptr, int32); @@ -102,6 +103,7 @@ HaveSpan: runtime_throw("MHeap_AllocLocked - bad npages"); runtime_MSpanList_Remove(s); s->state = MSpanInUse; + mstats.heap_idle -= s->npages<<PageShift; if(s->npages > npage) { // Trim extra and put it back in the heap. @@ -277,6 +279,7 @@ MHeap_FreeLocked(MHeap *h, MSpan *s) // runtime_printf("MHeap_FreeLocked - span %p ptr %p state %d ref %d\n", s, s->start<<PageShift, s->state, s->ref); runtime_throw("MHeap_FreeLocked - invalid free"); } + mstats.heap_idle += s->npages<<PageShift; s->state = MSpanFree; runtime_MSpanList_Remove(s); sp = (uintptr*)(s->start<<PageShift); |