diff options
| author | Russ Cox <rsc@golang.org> | 2009-10-12 10:26:38 -0700 |
|---|---|---|
| committer | Russ Cox <rsc@golang.org> | 2009-10-12 10:26:38 -0700 |
| commit | efa39fa7cc4e0413ee534342783f032276b6514d (patch) | |
| tree | da51e7592c895d32c8acf0bed84cdd5cfa1dbc01 /src/pkg/runtime/proc.c | |
| parent | 407480ed58c58d0e334acec1ffd5cf237e61168f (diff) | |
| download | golang-efa39fa7cc4e0413ee534342783f032276b6514d.tar.gz | |
stack overflow debugging and fix.
* in 6l, -K already meant check for stack underflow.
add -KK to mean double-check stack overflows
even in nosplit functions.
* comment out print locks; they deadlock too easily
but are still useful to put back for special occasions.
* let runcgo assembly switch to scheduler stack
without involving scheduler directly. because runcgo
gets called from matchmg, it is too hard to keep it
from being called on other stacks.
R=r
DELTA=94 (65 added, 18 deleted, 11 changed)
OCL=35591
CL=35604
Diffstat (limited to 'src/pkg/runtime/proc.c')
| -rw-r--r-- | src/pkg/runtime/proc.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/src/pkg/runtime/proc.c b/src/pkg/runtime/proc.c index f6f2bb2b3..4113002ad 100644 --- a/src/pkg/runtime/proc.c +++ b/src/pkg/runtime/proc.c @@ -95,7 +95,7 @@ schedinit(void) { int32 n; byte *p; - + allm = m; mallocinit(); @@ -452,15 +452,6 @@ scheduler(void) lock(&sched); if(gosave(&m->sched) != 0){ gp = m->curg; - if(gp->status == Gcgocall){ - // Runtime call into external code (FFI). - // When running with FFI, the scheduler stack is a - // native pthread stack, so it suffices to switch to the - // scheduler stack and make the call. - runcgo(gp->cgofn, gp->cgoarg); - gp->status = Grunning; - gogo(&gp->sched, 1); - } // Jumped here via gosave/gogo, so didn't // execute lock(&sched) above. |