From: Alex Brainman <alex.brainman@gmail.com>
Date: Tue, 15 Oct 2013 18:37:43 +0000 (-0400)
Subject: undo CL 14231047 / 2f4c2dde2756
X-Git-Tag: go1.2rc2~16
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=9aee98def8e6c6ce6af36ffab1348c1f9356e316;p=gostls13.git

undo CL 14231047 / 2f4c2dde2756

undone because the change slows down profile collection
significantly and unpredictable at times (see comments
at https://golang.org/cl/14231047 for details)

««« original CL description
runtime: collect profiles even while on g0 stack

Fixes #6417

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/14231047
»»»

R=golang-dev, rsc
CC=golang-dev
https://golang.org/cl/14535046
---

diff --git a/src/pkg/runtime/os_windows.c b/src/pkg/runtime/os_windows.c
index 44c9b342de..c3e296aa67 100644
--- a/src/pkg/runtime/os_windows.c
+++ b/src/pkg/runtime/os_windows.c
@@ -402,7 +402,7 @@ profilem(M *mp)
 		tls = runtime·tls0;
 	gp = *(G**)tls;
 
-	if(gp != nil) {
+	if(gp != nil && gp != mp->g0 && gp->status != Gsyscall) {
 		// align Context to 16 bytes
 		r = (Context*)((uintptr)(&rbuf[15]) & ~15);
 		r->ContextFlags = CONTEXT_CONTROL;