From: Austin Clements <austin@google.com>
Date: Fri, 30 Oct 2015 02:40:36 +0000 (-0400)
Subject: runtime: clean up park messages
X-Git-Tag: go1.6beta1~561
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f84420c20daddf5f0a3e73f64bd2d39cebd22218;p=gostls13.git

runtime: clean up park messages

This changes "mark worker (idle)" to "GC worker (idle)" so it's more
clear to users that these goroutines are GC-related. It changes "GC
assist" to "GC assist wait" to make it clear that the assist is
blocked.

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

diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go
index a3326e344e..bf93259d50 100644
--- a/src/runtime/mgc.go
+++ b/src/runtime/mgc.go
@@ -1359,7 +1359,7 @@ func gcBgMarkWorker(p *p) {
 		gopark(func(g *g, mp unsafe.Pointer) bool {
 			releasem((*m)(mp))
 			return true
-		}, unsafe.Pointer(mp), "mark worker (idle)", traceEvGoBlock, 0)
+		}, unsafe.Pointer(mp), "GC worker (idle)", traceEvGoBlock, 0)
 
 		// Loop until the P dies and disassociates this
 		// worker. (The P may later be reused, in which case
diff --git a/src/runtime/mgcmark.go b/src/runtime/mgcmark.go
index f03441b2f9..f1a92e0be2 100644
--- a/src/runtime/mgcmark.go
+++ b/src/runtime/mgcmark.go
@@ -482,7 +482,7 @@ retry:
 			goto retry
 		}
 		// Park for real.
-		goparkunlock(&work.assistQueue.lock, "GC assist", traceEvGoBlock, 2)
+		goparkunlock(&work.assistQueue.lock, "GC assist wait", traceEvGoBlock, 2)
 
 		// At this point either background GC has satisfied
 		// this G's assist debt, or the GC cycle is over.