From 28b51184156e1261bb92e7ec4050a794dd606fa6 Mon Sep 17 00:00:00 2001 From: Austin Clements Date: Fri, 30 Jan 2015 15:30:41 -0500 Subject: runtime: rename m.gcing to m.preemptoff and make it a string m.gcing has become overloaded to mean "don't preempt this g" in general. Once the garbage collector is preemptible, the one thing it *won't* mean is that we're in the garbage collector. So, rename gcing to "preemptoff" and make it a string giving a reason that preemption is disabled. gcing was never set to anything but 0 or 1, so we don't have to worry about there being a stack of reasons. Change-Id: I4337c29e8e942e7aa4f106fc29597e1b5de4ef46 Reviewed-on: https://go-review.googlesource.com/3660 Reviewed-by: Russ Cox --- src/runtime/malloc.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/runtime/malloc.go') diff --git a/src/runtime/malloc.go b/src/runtime/malloc.go index ea1dd6ea49..b8b1f4ed36 100644 --- a/src/runtime/malloc.go +++ b/src/runtime/malloc.go @@ -362,7 +362,7 @@ func gcwork(force int32) { // Ok, we're doing it! Stop everybody else mp := acquirem() - mp.gcing = 1 + mp.preemptoff = "gcing" releasem(mp) gctimer.count++ if force == 0 { @@ -443,7 +443,7 @@ func gcwork(force int32) { } // all done - mp.gcing = 0 + mp.preemptoff = "" if force == 0 { gctimer.cycle.sweep = nanotime() -- cgit v1.3-5-g9baa