diff options
| author | Russ Cox <rsc@golang.org> | 2010-04-08 13:24:53 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2010-04-08 13:24:53 -0700 |
| commit | 1fa9a0c209f50aa6b8eac0755ce6ccd00ff2cf02 (patch) | |
| tree | da05f5d25317cb06e704f85c8a9c07943aa64f90 | |
| parent | 9d82a4bd77f53f0fdf78cfbf09d33ea4f3b37a02 (diff) | |
| download | golang-1fa9a0c209f50aa6b8eac0755ce6ccd00ff2cf02.tar.gz | |
runtime: fix bad status throw
when garbage collector sees recovering goroutine
Fixes issue 711.
R=r
CC=golang-dev
http://codereview.appspot.com/869045
| -rw-r--r-- | src/pkg/runtime/mgc0.c | 1 | ||||
| -rw-r--r-- | src/pkg/runtime/proc.c | 9 | ||||
| -rw-r--r-- | src/pkg/runtime/runtime.h | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/src/pkg/runtime/mgc0.c b/src/pkg/runtime/mgc0.c index f61c10c60..5265bea21 100644 --- a/src/pkg/runtime/mgc0.c +++ b/src/pkg/runtime/mgc0.c @@ -135,6 +135,7 @@ mark(void) case Grunnable: case Gsyscall: case Gwaiting: + case Grecovery: scanstack(gp); break; } diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c index 454a4a217..1a1895dcb 100644 --- a/src/pkg/runtime/proc.c +++ b/src/pkg/runtime/proc.c @@ -461,9 +461,7 @@ scheduler(void) // unwind to the stack frame with d->sp in it. unwindstack(gp, d->sp); - if(d->sp < gp->stackguard || gp->stackbase < d->sp) - throw("bad stack in recovery"); - + // make the deferproc for this d return again, // this time returning 1. function will jump to // standard return epilogue. @@ -930,6 +928,11 @@ unwindstack(G *gp, byte *sp) gp->stackguard = top->stackguard; free(stk); } + + if(sp != nil && (sp < gp->stackguard - StackGuard || gp->stackbase < sp)) { + printf("recover: %p not in [%p, %p]\n", sp, gp->stackguard - StackGuard, gp->stackbase); + throw("bad unwindstack"); + } } static void diff --git a/src/pkg/runtime/runtime.h b/src/pkg/runtime/runtime.h index e2aedb4ce..26ce4b635 100644 --- a/src/pkg/runtime/runtime.h +++ b/src/pkg/runtime/runtime.h @@ -92,6 +92,10 @@ extern register M* m; enum { // G status + // + // If you add to this list, add to the list + // of "okay during garbage collection" status + // in mgc0.c too. Gidle, Grunnable, Grunning, |