diff options
| author | Ian Lance Taylor <iant@golang.org> | 2020-10-15 14:39:12 -0700 |
|---|---|---|
| committer | Ian Lance Taylor <iant@golang.org> | 2020-10-16 23:50:26 +0000 |
| commit | 05739d6f17c57f09264272621b88725a463234d0 (patch) | |
| tree | a73e2e24c32ef4ded86525885caa2a4d02c9e4be /src/runtime/signal_unix.go | |
| parent | 3eae1a905854fd9f4ebeeae406c4ebb88cbd779b (diff) | |
| download | go-05739d6f17c57f09264272621b88725a463234d0.tar.gz go-05739d6f17c57f09264272621b88725a463234d0.zip | |
runtime: wait for preemption signals before syscall.Exec
Fixes #41702
Fixes #42023
Change-Id: If07f40b1d73b8f276ee28ffb8b7214175e56c24d
Reviewed-on: https://go-review.googlesource.com/c/go/+/262817
Trust: Ian Lance Taylor <iant@golang.org>
Trust: Bryan C. Mills <bcmills@google.com>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Diffstat (limited to 'src/runtime/signal_unix.go')
| -rw-r--r-- | src/runtime/signal_unix.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/runtime/signal_unix.go b/src/runtime/signal_unix.go index c228de47b4..e8b6f95d8f 100644 --- a/src/runtime/signal_unix.go +++ b/src/runtime/signal_unix.go @@ -335,6 +335,10 @@ func doSigPreempt(gp *g, ctxt *sigctxt) { // Acknowledge the preemption. atomic.Xadd(&gp.m.preemptGen, 1) atomic.Store(&gp.m.signalPending, 0) + + if GOOS == "darwin" { + atomic.Xadd(&pendingPreemptSignals, -1) + } } const preemptMSupported = true @@ -364,6 +368,10 @@ func preemptM(mp *m) { } if atomic.Cas(&mp.signalPending, 0, 1) { + if GOOS == "darwin" { + atomic.Xadd(&pendingPreemptSignals, 1) + } + // If multiple threads are preempting the same M, it may send many // signals to the same M such that it hardly make progress, causing // live-lock problem. Apparently this could happen on darwin. See @@ -435,6 +443,9 @@ func sigtrampgo(sig uint32, info *siginfo, ctx unsafe.Pointer) { // no non-Go signal handler for sigPreempt. // The default behavior for sigPreempt is to ignore // the signal, so badsignal will be a no-op anyway. + if GOOS == "darwin" { + atomic.Xadd(&pendingPreemptSignals, -1) + } return } c.fixsigcode(sig) |