[release-branch.go1.1] runtime: properly set G status after syscall

««« CL 9307045 / fab6ba2a2d10
runtime: properly set G status after syscall

R=golang-dev, r, dave
CC=golang-dev
https://golang.org/cl/9307045
»»»

R=golang-dev, bradfitz
CC=golang-dev
https://golang.org/cl/11694043

diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c
index 31876b62a957fd17f254b79131bc21ecf373c8a1..5734509e0cca9502c427b96f5e9d0477b095e3a4 100644 (file)
--- a/src/pkg/runtime/proc.c
+++ b/src/pkg/runtime/proc.c
@@ -1371,6 +1371,8 @@ runtime·exitsyscall(void)
                runtime·unlock(&runtime·sched);
                if(p) {
                        acquirep(p);
+                       m->p->tick++;
+                       g->status = Grunning;
                        g->gcstack = (uintptr)nil;
                        g->gcsp = (uintptr)nil;
                        return;