diff options
| author | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-09-16 15:47:21 +0000 |
|---|---|---|
| committer | Ian Lance Taylor <ian@gcc.gnu.org> | 2011-09-16 15:47:21 +0000 |
| commit | adb0401dac41c81571722312d4586b2693f95aa6 (patch) | |
| tree | ea2b52e3c258d6b6d9356977c683c7f72a4a5fd5 /libgo/runtime/mheap.c | |
| parent | 5548ca3540bccbc908a45942896d635ea5f1c23f (diff) | |
| download | gcc-adb0401dac41c81571722312d4586b2693f95aa6.zip gcc-adb0401dac41c81571722312d4586b2693f95aa6.tar.gz gcc-adb0401dac41c81571722312d4586b2693f95aa6.tar.bz2 | |
Update Go library to r60.
From-SVN: r178910
Diffstat (limited to 'libgo/runtime/mheap.c')
| -rw-r--r-- | libgo/runtime/mheap.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/libgo/runtime/mheap.c b/libgo/runtime/mheap.c index cc6b3af..cacac7d 100644 --- a/libgo/runtime/mheap.c +++ b/libgo/runtime/mheap.c @@ -58,10 +58,7 @@ runtime_MHeap_Alloc(MHeap *h, uintptr npage, int32 sizeclass, int32 acct) MSpan *s; runtime_lock(h); - mstats.heap_alloc += m->mcache->local_alloc; - m->mcache->local_alloc = 0; - mstats.heap_objects += m->mcache->local_objects; - m->mcache->local_objects = 0; + runtime_purgecachedstats(m); s = MHeap_AllocLocked(h, npage, sizeclass); if(s != nil) { mstats.heap_inuse += npage<<PageShift; @@ -259,10 +256,7 @@ void runtime_MHeap_Free(MHeap *h, MSpan *s, int32 acct) { runtime_lock(h); - mstats.heap_alloc += m->mcache->local_alloc; - m->mcache->local_alloc = 0; - mstats.heap_objects += m->mcache->local_objects; - m->mcache->local_objects = 0; + runtime_purgecachedstats(m); mstats.heap_inuse -= s->npages<<PageShift; if(acct) { mstats.heap_alloc -= s->npages<<PageShift; |