From: Austin Clements Date: Thu, 25 Jun 2015 16:24:44 +0000 (-0400) Subject: runtime: remove unused _GCsweep state X-Git-Tag: go1.5beta1~62 X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=f73b2fca849324e6510338f9a36d16af6ae68a3f;p=gostls13.git runtime: remove unused _GCsweep state We don't use this state. _GCoff means we're sweeping in the background. This makes it clear in the next commit that _GCoff and only _GCoff means sweeping. Change-Id: I416324a829ba0be3794a6cf3cf1655114cb6e47c Reviewed-on: https://go-review.googlesource.com/11501 Reviewed-by: Rick Hudson Reviewed-by: Russ Cox --- diff --git a/src/runtime/mgc.go b/src/runtime/mgc.go index 6289cb57a2..c0318a0a62 100644 --- a/src/runtime/mgc.go +++ b/src/runtime/mgc.go @@ -46,13 +46,12 @@ // 11. GC preempts P's one-by-one taking partial wbufs and marks all unmarked yet // reachable objects. // 12. When GC completes a full cycle over P's and discovers no new grey -// objects, (which means all reachable objects are marked) set phase = GCsweep. +// objects, (which means all reachable objects are marked) set phase = GCoff. // 13. Wait for all P's to acknowledge phase change. // 14. Now malloc allocates white (but sweeps spans before use). // Write barrier becomes nop. // 15. GC does background sweeping, see description below. -// 16. When sweeping is complete set phase to GCoff. -// 17. When sufficient allocation has taken place replay the sequence starting at 0 above, +// 16. When sufficient allocation has taken place replay the sequence starting at 0 above, // see discussion of GC rate below. // Changing phases. @@ -241,12 +240,11 @@ var gcBlackenEnabled uint32 var gcBlackenPromptly bool const ( - _GCoff = iota // GC not running, write barrier disabled + _GCoff = iota // GC not running; sweeping in background, write barrier disabled _GCstw // unused state _GCscan // GC collecting roots into workbufs, write barrier ENABLED _GCmark // GC marking from workbufs, write barrier ENABLED _GCmarktermination // GC mark termination: allocate black, P's help GC, write barrier ENABLED - _GCsweep // GC mark completed; sweeping in background, write barrier disabled ) //go:nosplit