code review 12609043: runtime: fix traceback in cgo programs

runtime: fix traceback in cgo programs
Fixes issue 6061.

[dvyukov, 2013-08-07 20:00:35]

Hello golang-dev@googlegroups.com,

I'd like you to review this change to
https://dvyukov%40google.com@code.google.com/p/go/

[dvyukov, 2013-08-07 20:05:20]

https://codereview.appspot.com/12609043/diff/6001/src/pkg/runtime/proc.c
File src/pkg/runtime/proc.c (right):

https://codereview.appspot.com/12609043/diff/6001/src/pkg/runtime/proc.c#newc...
src/pkg/runtime/proc.c:724: gp->goid = runtime·xadd64(&runtime·sched.goidgen,
1);
I've moved this, so that we put fully initialized g into allg.

[bradfitz, 2013-08-07 20:23:21]

LGTM

Works for me now on darwin-amd64.

Thanks!


On Wed, Aug 7, 2013 at 1:00 PM, <dvyukov@google.com> wrote:

> Reviewers: golang-dev1,
>
> Message:
> Hello golang-dev@googlegroups.com,
>
> I'd like you to review this change to
>
https://dvyukov%40google.com@**code.google.com/p/go/<http://40google.com@code...
>
>
> Description:
> runtime: fix traceback in cgo programs
> Fixes issue 6061.
>
> Please review this at
https://codereview.appspot.**com/12609043/<https://codereview.appspot.com/126...
>
> Affected files:
>   M src/pkg/runtime/crash_cgo_**test.go
>   M src/pkg/runtime/panic.c
>   M src/pkg/runtime/proc.c
>
>
> Index: src/pkg/runtime/crash_cgo_**test.go
> ==============================**==============================**=======
> --- a/src/pkg/runtime/crash_cgo_**test.go
> +++ b/src/pkg/runtime/crash_cgo_**test.go
> @@ -22,6 +22,14 @@
>         }
>  }
>
> +func TestCgoTraceback(t *testing.T) {
> +       got := executeTest(t, cgoTracebackSource, nil)
> +       want := "OK\n"
> +       if got != want {
> +               t.Fatalf("expected %q, but got %q", want, got)
> +       }
> +}
> +
>  const cgoSignalDeadlockSource = `
>  package main
>
> @@ -86,3 +94,22 @@
>         fmt.Printf("OK\n")
>  }
>  `
> +
> +const cgoTracebackSource = `
> +package main
> +
> +/* void foo(void) {} */
> +import "C"
> +
> +import (
> +       "fmt"
> +       "runtime"
> +)
> +
> +func main() {
> +       C.foo()
> +       buf := make([]byte, 1)
> +       runtime.Stack(buf, true)
> +       fmt.Printf("OK\n")
> +}
> +`
> Index: src/pkg/runtime/panic.c
> ==============================**==============================**=======
> --- a/src/pkg/runtime/panic.c
> +++ b/src/pkg/runtime/panic.c
> @@ -415,6 +415,8 @@
>                 runtime·exit(3);
>         }
>         m->dying = 1;
> +       if(g != nil)
> +               g->writebuf = nil;
>         runtime·xadd(&runtime·**panicking, 1);
>         runtime·lock(&paniclk);
>  }
> Index: src/pkg/runtime/proc.c
> ==============================**==============================**=======
> --- a/src/pkg/runtime/proc.c
> +++ b/src/pkg/runtime/proc.c
> @@ -712,11 +712,18 @@
>         gp->sched.sp = gp->stackbase;
>         gp->sched.lr = 0;
>         gp->sched.g = gp;
> +       gp->syscallpc = gp->sched.pc;
> +       gp->syscallsp = gp->sched.sp;
> +       gp->syscallstack = gp->stackbase;
> +       gp->syscallguard = gp->stackguard;
>         gp->status = Gsyscall;
>         mp->curg = gp;
>         mp->locked = LockInternal;
>         mp->lockedg = gp;
>         gp->lockedm = mp;
> +       gp->goid = runtime·xadd64(&runtime·sched.**goidgen, 1);
> +       if(raceenabled)
> +               gp->racectx = runtime·racegostart(runtime·**newextram);
>         // put on allg for garbage collector
>         runtime·lock(&runtime·sched);
>         if(runtime·lastg == nil)
> @@ -725,9 +732,6 @@
>                 runtime·lastg->alllink = gp;
>         runtime·lastg = gp;
>         runtime·unlock(&runtime·sched)**;
> -       gp->goid = runtime·xadd64(&runtime·sched.**goidgen, 1);
> -       if(raceenabled)
> -               gp->racectx = runtime·racegostart(runtime·**newextram);
>
>         // Add m to the extra list.
>         mnext = lockextra(true);
>
>
> --
>
> ---You received this message because you are subscribed to the Google
> Groups "golang-dev" group.
> To unsubscribe from this group and stop receiving emails from it, send an
> email to
golang-dev+unsubscribe@**googlegroups.com<golang-dev%2Bunsubscribe@googlegrou...
> .
> For more options, visit
https://groups.google.com/**groups/opt_out<https://groups.google.com/groups/o...
> .
>
>
>

[dvyukov, 2013-08-07 20:31:59]

*** Submitted as https://code.google.com/p/go/source/detail?r=60d62a3b3991 ***

runtime: fix traceback in cgo programs
Fixes issue 6061.

R=golang-dev, bradfitz
CC=golang-dev
https://codereview.appspot.com/12609043