From: Rick Hudson <rlh@golang.org>
Date: Mon, 8 Feb 2016 14:53:14 +0000 (-0500)
Subject: [dev.garbage] runtime: add stackfreelist
X-Git-Tag: go1.7beta1~405^2~21
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=aed861038f876643a67c2297b384b6be140c46c1;p=gostls13.git

[dev.garbage] runtime: add stackfreelist

The freelist for normal objects and the freelist
for stacks share the same mspan field for holding
the list head but are operated on by different code
sequences. This overloading complicates the use of bit
vectors for allocation of normal objects. This change
refactors the use of the stackfreelist out from the
use of freelist.

Change-Id: I5b155b5b8a1fcd8e24c12ee1eb0800ad9b6b4fa0
Reviewed-on: https://go-review.googlesource.com/19315
Reviewed-by: Austin Clements <austin@google.com>
---

diff --git a/src/runtime/mheap.go b/src/runtime/mheap.go
index 8c843be946..a3d34a360e 100644
--- a/src/runtime/mheap.go
+++ b/src/runtime/mheap.go
@@ -552,7 +552,7 @@ func (h *mheap) allocStack(npage uintptr) *mspan {
 	s := h.allocSpanLocked(npage)
 	if s != nil {
 		s.state = _MSpanStack
-		s.freelist = 0
+		s.stackfreelist = 0
 		s.ref = 0
 		memstats.stacks_inuse += uint64(s.npages << _PageShift)
 	}
diff --git a/src/runtime/stack.go b/src/runtime/stack.go
index fdd6710bad..5e373f1b94 100644
--- a/src/runtime/stack.go
+++ b/src/runtime/stack.go
@@ -194,23 +194,23 @@ func stackpoolalloc(order uint8) gclinkptr {
 		if s.ref != 0 {
 			throw("bad ref")
 		}
-		if s.freelist.ptr() != nil {
-			throw("bad freelist")
+		if s.stackfreelist.ptr() != nil {
+			throw("bad stackfreelist")
 		}
 		for i := uintptr(0); i < _StackCacheSize; i += _FixedStack << order {
 			x := gclinkptr(uintptr(s.start)<<_PageShift + i)
-			x.ptr().next = s.freelist
-			s.freelist = x
+			x.ptr().next = s.stackfreelist
+			s.stackfreelist = x
 		}
 		list.insert(s)
 	}
-	x := s.freelist
+	x := s.stackfreelist
 	if x.ptr() == nil {
 		throw("span has no free stacks")
 	}
-	s.freelist = x.ptr().next
+	s.stackfreelist = x.ptr().next
 	s.ref++
-	if s.freelist.ptr() == nil {
+	if s.stackfreelist.ptr() == nil {
 		// all stacks in s are allocated.
 		list.remove(s)
 	}
@@ -223,12 +223,12 @@ func stackpoolfree(x gclinkptr, order uint8) {
 	if s.state != _MSpanStack {
 		throw("freeing stack not in a stack span")
 	}
-	if s.freelist.ptr() == nil {
+	if s.stackfreelist.ptr() == nil {
 		// s will now have a free stack
 		stackpool[order].insert(s)
 	}
-	x.ptr().next = s.freelist
-	s.freelist = x
+	x.ptr().next = s.stackfreelist
+	s.stackfreelist = x
 	s.ref--
 	if gcphase == _GCoff && s.ref == 0 {
 		// Span is completely free. Return it to the heap
@@ -247,7 +247,7 @@ func stackpoolfree(x gclinkptr, order uint8) {
 		//
 		// By not freeing, we prevent step #4 until GC is done.
 		stackpool[order].remove(s)
-		s.freelist = 0
+		s.stackfreelist = 0
 		mheap_.freeStack(s)
 	}
 }
@@ -1138,6 +1138,7 @@ func freeStackSpans() {
 			if s.ref == 0 {
 				list.remove(s)
 				s.freelist = 0
+				s.stackfreelist = 0
 				mheap_.freeStack(s)
 			}
 			s = next