diff options
| author | Tobias Klauser <tklauser@distanz.ch> | 2021-05-01 19:43:55 +0200 |
|---|---|---|
| committer | Tobias Klauser <tobias.klauser@gmail.com> | 2021-05-02 21:26:09 +0000 |
| commit | b177b2d51ea14637d7a75542cbfd3843db387453 (patch) | |
| tree | 4fc1773a2eb5ce6a53cc45e2282ee60d4b02eb0f /src/os | |
| parent | 7eb2d308830003432601f9b40ba5ccf7382b6157 (diff) | |
| download | go-b177b2d51ea14637d7a75542cbfd3843db387453.tar.gz go-b177b2d51ea14637d7a75542cbfd3843db387453.zip | |
os, syscall: use wait6 to avoid wait/kill race on dragonfly
Follow CL 23967 and CL 24021 which did the same on linux and freebsd,
respectively.
Updates #13987
Updates #16028
Change-Id: Ia30ef8b5cffd8f9eb75c29ee5fe350dac2be6d44
Reviewed-on: https://go-review.googlesource.com/c/go/+/315279
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/os')
| -rw-r--r-- | src/os/wait_unimp.go | 4 | ||||
| -rw-r--r-- | src/os/wait_wait6.go | 12 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/os/wait_unimp.go b/src/os/wait_unimp.go index 28dc2a5939..07b5b6b66b 100644 --- a/src/os/wait_unimp.go +++ b/src/os/wait_unimp.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build aix || darwin || dragonfly || (js && wasm) || netbsd || openbsd || solaris -// +build aix darwin dragonfly js,wasm netbsd openbsd solaris +//go:build aix || darwin || (js && wasm) || netbsd || openbsd || solaris +// +build aix darwin js,wasm netbsd openbsd solaris package os diff --git a/src/os/wait_wait6.go b/src/os/wait_wait6.go index 895f21069a..51193401f9 100644 --- a/src/os/wait_wait6.go +++ b/src/os/wait_wait6.go @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -//go:build freebsd -// +build freebsd +//go:build dragonfly || freebsd +// +build dragonfly freebsd package os @@ -23,9 +23,9 @@ func (p *Process) blockUntilWaitable() (bool, error) { // The arguments on 32-bit FreeBSD look like the following: // - freebsd32_wait6_args{ idtype, id1, id2, status, options, wrusage, info } or // - freebsd32_wait6_args{ idtype, pad, id1, id2, status, options, wrusage, info } when PAD64_REQUIRED=1 on ARM, MIPS or PowerPC - if runtime.GOARCH == "386" { + if runtime.GOOS == "freebsd" && runtime.GOARCH == "386" { _, _, errno = syscall.Syscall9(syscall.SYS_WAIT6, _P_PID, uintptr(p.Pid), 0, 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0, 0, 0) - } else if runtime.GOARCH == "arm" { + } else if runtime.GOOS == "freebsd" && runtime.GOARCH == "arm" { _, _, errno = syscall.Syscall9(syscall.SYS_WAIT6, _P_PID, 0, uintptr(p.Pid), 0, 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0, 0) } else { _, _, errno = syscall.Syscall6(syscall.SYS_WAIT6, _P_PID, uintptr(p.Pid), 0, syscall.WEXITED|syscall.WNOWAIT, 0, 0) @@ -35,7 +35,9 @@ func (p *Process) blockUntilWaitable() (bool, error) { } } runtime.KeepAlive(p) - if errno != 0 { + if errno == syscall.ENOSYS { + return false, nil + } else if errno != 0 { return false, NewSyscallError("wait6", errno) } return true, nil |