diff options
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | libgo/go/runtime/proc.go | 11 | ||||
| -rw-r--r-- | libgo/go/runtime/runtime2.go | 6 | ||||
| -rw-r--r-- | libgo/go/runtime/traceback_gccgo.go | 15 |
4 files changed, 23 insertions, 11 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 67abd99..94604b2 100644 --- a/gcc/go/gofrontend/MERGE +++ b/gcc/go/gofrontend/MERGE @@ -1,4 +1,4 @@ -ee94431c133a90ca5c3c5ebbebcb019c60258dac +d6576c83016d856217758c06d945bfc363ffb817 The first line of this file holds the git revision number of the last merge done from the gofrontend repository. diff --git a/libgo/go/runtime/proc.go b/libgo/go/runtime/proc.go index ef166cb..655d0a9 100644 --- a/libgo/go/runtime/proc.go +++ b/libgo/go/runtime/proc.go @@ -956,6 +956,10 @@ loop: break loop } + case _Gexitingsyscall: + // This is a transient state during which we should not scan its stack. + // Try again. + case _Gscanwaiting: // newstack is doing a scan for us right now. Wait. @@ -2635,8 +2639,8 @@ func park_m(gp *g) { traceGoPark(_g_.m.waittraceev, _g_.m.waittraceskip) } - casgstatus(gp, _Grunning, _Gwaiting) dropg() + casgstatus(gp, _Grunning, _Gwaiting) if _g_.m.waitunlockf != nil { fn := *(*func(*g, unsafe.Pointer) bool)(unsafe.Pointer(&_g_.m.waitunlockf)) @@ -2660,8 +2664,8 @@ func goschedImpl(gp *g) { dumpgstatus(gp) throw("bad g status") } - casgstatus(gp, _Grunning, _Grunnable) dropg() + casgstatus(gp, _Grunning, _Grunnable) lock(&sched.lock) globrunqput(gp) unlock(&sched.lock) @@ -3054,8 +3058,9 @@ func exitsyscallfast_pidle() bool { func exitsyscall0(gp *g) { _g_ := getg() - casgstatus(gp, _Gsyscall, _Grunnable) + casgstatus(gp, _Gsyscall, _Gexitingsyscall) dropg() + casgstatus(gp, _Gexitingsyscall, _Grunnable) lock(&sched.lock) _p_ := pidleget() if _p_ == nil { diff --git a/libgo/go/runtime/runtime2.go b/libgo/go/runtime/runtime2.go index 6eb9491..0e9cf63 100644 --- a/libgo/go/runtime/runtime2.go +++ b/libgo/go/runtime/runtime2.go @@ -70,6 +70,12 @@ const ( // stack is owned by the goroutine that put it in _Gcopystack. _Gcopystack // 8 + // _Gexitingsyscall means this goroutine is exiting from a + // system call. This is like _Gsyscall, but the GC should not + // scan its stack. Currently this is only used in exitsyscall0 + // as a transient state when it drops the G. + _Gexitingsyscall // 9 + // _Gscan combined with one of the above states other than // _Grunning indicates that GC is scanning the stack. The // goroutine is not executing user code and the stack is owned diff --git a/libgo/go/runtime/traceback_gccgo.go b/libgo/go/runtime/traceback_gccgo.go index 7347cea..72a83a5 100644 --- a/libgo/go/runtime/traceback_gccgo.go +++ b/libgo/go/runtime/traceback_gccgo.go @@ -122,13 +122,14 @@ func isExportedRuntime(name string) bool { } var gStatusStrings = [...]string{ - _Gidle: "idle", - _Grunnable: "runnable", - _Grunning: "running", - _Gsyscall: "syscall", - _Gwaiting: "waiting", - _Gdead: "dead", - _Gcopystack: "copystack", + _Gidle: "idle", + _Grunnable: "runnable", + _Grunning: "running", + _Gsyscall: "syscall", + _Gwaiting: "waiting", + _Gdead: "dead", + _Gcopystack: "copystack", + _Gexitingsyscall: "exiting syscall", } func goroutineheader(gp *g) { |