From: Austin Clements <austin@google.com>
Date: Fri, 24 Apr 2015 18:17:42 +0000 (-0400)
Subject: runtime: rename gcController.findRunnable to findRunnableGCWorker
X-Git-Tag: go1.5beta1~893
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=1b01910c0664f8863dd96b6781ca6c9e2cc6ed9d;p=gostls13.git

runtime: rename gcController.findRunnable to findRunnableGCWorker

This avoids confusion with the main findrunnable in the scheduler.

Change-Id: I8cf40657557a8610a2fe5a2f74598518256ca7f0
Reviewed-on: https://go-review.googlesource.com/9305
Reviewed-by: Rick Hudson <rlh@golang.org>
---

diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go
index d173e68a38..bf1d89512f 100644
--- a/src/runtime/mgc.go
+++ b/src/runtime/mgc.go
@@ -464,9 +464,9 @@ func (c *gcControllerState) endCycle() {
 	c.workRatioAvg = workRatioWeight*workRatio + (1-workRatioWeight)*c.workRatioAvg
 }
 
-// findRunnable returns the background mark worker for _p_ if it
+// findRunnableGCWorker returns the background mark worker for _p_ if it
 // should be run. This must only be called when gcBlackenEnabled != 0.
-func (c *gcControllerState) findRunnable(_p_ *p) *g {
+func (c *gcControllerState) findRunnableGCWorker(_p_ *p) *g {
 	if gcBlackenEnabled == 0 {
 		throw("gcControllerState.findRunnable: blackening not enabled")
 	}
diff --git a/src/runtime/proc1.go b/src/runtime/proc1.go
index 0859015b0a..3751e35bb7 100644
--- a/src/runtime/proc1.go
+++ b/src/runtime/proc1.go
@@ -1598,7 +1598,7 @@ top:
 		}
 	}
 	if gp == nil && gcBlackenEnabled != 0 {
-		gp = gcController.findRunnable(_g_.m.p.ptr())
+		gp = gcController.findRunnableGCWorker(_g_.m.p.ptr())
 		if gp != nil {
 			resetspinning()
 		}