Skip to content

Commit d74bf73

Browse files
tklausergopherbot
authored andcommitted
os: use wait6 to avoid wait/kill race on netbsd
Resend of CL 315281 which was partially reverted by CL 354249 after the original CL was suspected to cause test failures as reported in #48789. It seems that both wait4 and wait6 lead to that particular deadlock, so let's use wait6. That way we at least don't hit #13987 on netbsd. Updates #13987 For #48789 For #50138 Change-Id: Iadc4a771217b7e9e821502e89afa07036e0dcb6f Reviewed-on: https://go-review.googlesource.com/c/go/+/431855 Reviewed-by: Benny Siegert <[email protected]> Auto-Submit: Tobias Klauser <[email protected]> Run-TryBot: Tobias Klauser <[email protected]> Reviewed-by: Bryan Mills <[email protected]> TryBot-Result: Gopher Robot <[email protected]>
1 parent e283473 commit d74bf73

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/os/wait_unimp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// waitid/wait6. netbsd implements wait6, but that is causing test
77
// failures, see issue #48789.
88

9-
//go:build aix || darwin || (js && wasm) || netbsd || openbsd || solaris
9+
//go:build aix || darwin || (js && wasm) || openbsd || solaris
1010

1111
package os
1212

src/os/wait_wait6.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
//go:build dragonfly || freebsd
5+
//go:build dragonfly || freebsd || netbsd
66

77
package os
88

0 commit comments

Comments
 (0)