aboutsummaryrefslogtreecommitdiff
path: root/src/syscall
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2021-05-01 19:43:55 +0200
committerTobias Klauser <tobias.klauser@gmail.com>2021-05-02 21:26:09 +0000
commitb177b2d51ea14637d7a75542cbfd3843db387453 (patch)
tree4fc1773a2eb5ce6a53cc45e2282ee60d4b02eb0f /src/syscall
parent7eb2d308830003432601f9b40ba5ccf7382b6157 (diff)
downloadgo-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/syscall')
-rw-r--r--src/syscall/zerrors_dragonfly_amd64.go2
-rw-r--r--src/syscall/zsysnum_dragonfly_amd64.go1
2 files changed, 3 insertions, 0 deletions
diff --git a/src/syscall/zerrors_dragonfly_amd64.go b/src/syscall/zerrors_dragonfly_amd64.go
index 8ed611b3e4..35e2a52d25 100644
--- a/src/syscall/zerrors_dragonfly_amd64.go
+++ b/src/syscall/zerrors_dragonfly_amd64.go
@@ -1239,8 +1239,10 @@ const (
VWERASE = 0x4
WCONTINUED = 0x4
WCOREFLAG = 0x80
+ WEXITED = 0x10
WLINUXCLONE = 0x80000000
WNOHANG = 0x1
+ WNOWAIT = 0x8
WSTOPPED = 0x7f
WUNTRACED = 0x2
)
diff --git a/src/syscall/zsysnum_dragonfly_amd64.go b/src/syscall/zsysnum_dragonfly_amd64.go
index ae504a5f0c..e8996db0f8 100644
--- a/src/syscall/zsysnum_dragonfly_amd64.go
+++ b/src/syscall/zsysnum_dragonfly_amd64.go
@@ -305,4 +305,5 @@ const (
SYS_PIPE2 = 538 // { int pipe2(int *fildes, int flags); }
SYS_UTIMENSAT = 539 // { int utimensat(int fd, const char *path, const struct timespec *ts, int flags); }
SYS_ACCEPT4 = 541 // { int accept4(int s, caddr_t name, int *anamelen, int flags); }
+ SYS_WAIT6 = 548 // { int wait6(idtype_t idtype, id_t id, int *status, int options, struct __wrusage *wrusage, siginfo_t *info); }
)