diff options
Diffstat (limited to 'src/runtime/mheap.go')
| -rw-r--r-- | src/runtime/mheap.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/runtime/mheap.go b/src/runtime/mheap.go index d5dde5e72e..cd35acb6dd 100644 --- a/src/runtime/mheap.go +++ b/src/runtime/mheap.go @@ -159,7 +159,7 @@ type mspan struct { sweepgen uint32 divMul uint32 // for divide by elemsize - divMagic.mul - ref uint16 // capacity - number of objects in freelist + allocCount uint16 // capacity - number of objects in freelist sizeclass uint8 // size class incache bool // being used by an mcache state uint8 // mspaninuse etc @@ -471,7 +471,7 @@ func (h *mheap) alloc_m(npage uintptr, sizeclass int32, large bool) *mspan { // able to map interior pointer to containing span. atomic.Store(&s.sweepgen, h.sweepgen) s.state = _MSpanInUse - s.ref = 0 + s.allocCount = 0 s.sizeclass = uint8(sizeclass) if sizeclass == 0 { s.elemsize = s.npages << _PageShift @@ -551,7 +551,7 @@ func (h *mheap) allocStack(npage uintptr) *mspan { if s != nil { s.state = _MSpanStack s.stackfreelist = 0 - s.ref = 0 + s.allocCount = 0 memstats.stacks_inuse += uint64(s.npages << _PageShift) } @@ -773,12 +773,12 @@ func (h *mheap) freeStack(s *mspan) { func (h *mheap) freeSpanLocked(s *mspan, acctinuse, acctidle bool, unusedsince int64) { switch s.state { case _MSpanStack: - if s.ref != 0 { + if s.allocCount != 0 { throw("MHeap_FreeSpanLocked - invalid stack free") } case _MSpanInUse: - if s.ref != 0 || s.sweepgen != h.sweepgen { - print("MHeap_FreeSpanLocked - span ", s, " ptr ", hex(s.start<<_PageShift), " ref ", s.ref, " sweepgen ", s.sweepgen, "/", h.sweepgen, "\n") + if s.allocCount != 0 || s.sweepgen != h.sweepgen { + print("MHeap_FreeSpanLocked - span ", s, " ptr ", hex(s.start<<_PageShift), " allocCount ", s.allocCount, " sweepgen ", s.sweepgen, "/", h.sweepgen, "\n") throw("MHeap_FreeSpanLocked - invalid free") } h.pagesInUse -= uint64(s.npages) @@ -912,7 +912,7 @@ func (span *mspan) init(start pageID, npages uintptr) { span.list = nil span.start = start span.npages = npages - span.ref = 0 + span.allocCount = 0 span.sizeclass = 0 span.incache = false span.elemsize = 0 |