From: Russ Cox <rsc@golang.org>
Date: Wed, 17 Jul 2013 18:03:27 +0000 (-0400)
Subject: runtime: re-enable preemption
X-Git-Tag: go1.2rc2~1020
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=b913cf84dc5bc78197b0ea42d9375ec1a7a01909;p=gostls13.git

runtime: re-enable preemption

Update #543

I believe the runtime is strong enough now to reenable
preemption during the function prologue.
Assuming this is or can be made stable, it will be in Go 1.2.
More aggressive preemption is not planned for Go 1.2.

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/11433045
---

diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c
index 3ce281fc77..74e92a63fa 100644
--- a/src/pkg/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
@@ -2175,12 +2175,6 @@ preemptone(P *p)
 	M *mp;
 	G *gp;
 
-// Preemption requires more robust traceback routines.
-// For now, disable.
-// The if(1) silences a compiler warning about the rest of the
-// function being unreachable.
-if(1) return;
-
 	mp = p->m;
 	if(mp == nil || mp == m)
 		return;