diff options
| author | Russ Cox <rsc@golang.org> | 2014-09-17 14:49:32 -0400 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2014-09-17 14:49:32 -0400 |
| commit | e19d8a47d1803a19446c658712c4bdff84d0da31 (patch) | |
| tree | 2e7903e0a12d21606597ecc82c38546e11506101 /src/runtime/malloc.go | |
| parent | a883f117a9dda5f218bb08dc1c4e181ab1679e11 (diff) | |
| download | go-e19d8a47d1803a19446c658712c4bdff84d0da31.tar.xz | |
runtime: account for tiny allocs, for testing.AllocsPerRun
Fixes #8734.
LGTM=r, bradfitz, dvyukov
R=bradfitz, r, dvyukov
CC=golang-codereviews, iant, khr
https://golang.org/cl/143150043
Diffstat (limited to 'src/runtime/malloc.go')
| -rw-r--r-- | src/runtime/malloc.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/runtime/malloc.go b/src/runtime/malloc.go index acf6b48f84..fc22cc29e4 100644 --- a/src/runtime/malloc.go +++ b/src/runtime/malloc.go @@ -103,7 +103,6 @@ func mallocgc(size uintptr, typ *_type, flags int) unsafe.Pointer { // standalone escaping variables. On a json benchmark // the allocator reduces number of allocations by ~12% and // reduces heap size by ~20%. - tinysize := uintptr(c.tinysize) if size <= tinysize { tiny := unsafe.Pointer(c.tiny) @@ -121,6 +120,7 @@ func mallocgc(size uintptr, typ *_type, flags int) unsafe.Pointer { x = tiny c.tiny = (*byte)(add(x, size)) c.tinysize -= uintptr(size1) + c.local_tinyallocs++ if debugMalloc { mp := acquirem() if mp.mallocing == 0 { |