diff options
| author | Josh Bleecher Snyder <josharian@gmail.com> | 2018-03-13 15:20:33 +0000 |
|---|---|---|
| committer | Josh Bleecher Snyder <josharian@gmail.com> | 2018-03-13 15:21:21 +0000 |
| commit | 6cb064c9c44fcd07bced22d2952a4856e5febc3e (patch) | |
| tree | 148501cfb3cbbf65fda30600ce80632365bfd452 /src/runtime/mgcmark.go | |
| parent | 911839c1f462260db0f001f8e017f10f688d2270 (diff) | |
| download | go-6cb064c9c44fcd07bced22d2952a4856e5febc3e.tar.xz | |
Revert "runtime: convert g.waitreason from string to uint8"
This reverts commit 4eea887fd477368653f6fcf8ad766030167936e5.
Reason for revert: broke s390x build
Change-Id: Id6c2b6a7319273c4d21f613d4cdd38b00d49f847
Reviewed-on: https://go-review.googlesource.com/100375
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
Diffstat (limited to 'src/runtime/mgcmark.go')
| -rw-r--r-- | src/runtime/mgcmark.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/runtime/mgcmark.go b/src/runtime/mgcmark.go index 06a2853741..270fa6cd32 100644 --- a/src/runtime/mgcmark.go +++ b/src/runtime/mgcmark.go @@ -251,7 +251,7 @@ func markroot(gcw *gcWork, i uint32) { selfScan := gp == userG && readgstatus(userG) == _Grunning if selfScan { casgstatus(userG, _Grunning, _Gwaiting) - userG.waitreason = waitReasonGarbageCollectionScan + userG.waitreason = "garbage collection scan" } // TODO: scang blocks until gp's stack has @@ -549,7 +549,7 @@ func gcAssistAlloc1(gp *g, scanWork int64) { // gcDrainN requires the caller to be preemptible. casgstatus(gp, _Grunning, _Gwaiting) - gp.waitreason = waitReasonGCAssistMarking + gp.waitreason = "GC assist marking" // drain own cached work first in the hopes that it // will be more cache friendly. @@ -648,7 +648,7 @@ func gcParkAssist() bool { return false } // Park. - goparkunlock(&work.assistQueue.lock, waitReasonGCAssistWait, traceEvGoBlockGC, 2) + goparkunlock(&work.assistQueue.lock, "GC assist wait", traceEvGoBlockGC, 2) return true } |