aboutsummaryrefslogtreecommitdiff
path: root/src/syscall
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2021-05-02 13:22:48 +0200
committerTobias Klauser <tobias.klauser@gmail.com>2021-05-04 12:44:42 +0000
commit45600bcd614f5855060b18b189f7e126fedfe637 (patch)
tree9289c681a92acc31f25381b42634bdbbd7bc8019 /src/syscall
parent138d2c9b88d9e3d5adcebf9cb7c356b43d6a9782 (diff)
downloadgo-45600bcd614f5855060b18b189f7e126fedfe637.tar.gz
go-45600bcd614f5855060b18b189f7e126fedfe637.zip
os, syscall: use wait6 to avoid wait/kill race on netbsd
Follow CL 23967 and CL 24021 which did the same on linux and freebsd, respectively. Updates #13987 Updates #16028 Change-Id: I95b13d8ddde4cea1ef4fb7d655f1ad1a219d13aa Reviewed-on: https://go-review.googlesource.com/c/go/+/315281 Trust: Tobias Klauser <tobias.klauser@gmail.com> Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com> Reviewed-by: Ian Lance Taylor <iant@golang.org>
Diffstat (limited to 'src/syscall')
-rw-r--r--src/syscall/zerrors_netbsd_386.go1
-rw-r--r--src/syscall/zerrors_netbsd_amd64.go1
-rw-r--r--src/syscall/zerrors_netbsd_arm.go1
-rw-r--r--src/syscall/zerrors_netbsd_arm64.go1
-rw-r--r--src/syscall/zsysnum_netbsd_386.go1
-rw-r--r--src/syscall/zsysnum_netbsd_amd64.go1
-rw-r--r--src/syscall/zsysnum_netbsd_arm.go1
-rw-r--r--src/syscall/zsysnum_netbsd_arm64.go1
8 files changed, 8 insertions, 0 deletions
diff --git a/src/syscall/zerrors_netbsd_386.go b/src/syscall/zerrors_netbsd_386.go
index 6a58946a4a..934e9ef073 100644
--- a/src/syscall/zerrors_netbsd_386.go
+++ b/src/syscall/zerrors_netbsd_386.go
@@ -1427,6 +1427,7 @@ const (
WALTSIG = 0x4
WCLONE = 0x4
WCOREFLAG = 0x80
+ WEXITED = 0x20
WNOHANG = 0x1
WNOWAIT = 0x10000
WNOZOMBIE = 0x20000
diff --git a/src/syscall/zerrors_netbsd_amd64.go b/src/syscall/zerrors_netbsd_amd64.go
index f5c5c2f49c..0f5ad61a9f 100644
--- a/src/syscall/zerrors_netbsd_amd64.go
+++ b/src/syscall/zerrors_netbsd_amd64.go
@@ -1417,6 +1417,7 @@ const (
WALTSIG = 0x4
WCLONE = 0x4
WCOREFLAG = 0x80
+ WEXITED = 0x20
WNOHANG = 0x1
WNOWAIT = 0x10000
WNOZOMBIE = 0x20000
diff --git a/src/syscall/zerrors_netbsd_arm.go b/src/syscall/zerrors_netbsd_arm.go
index c9d4579b41..9d8678750d 100644
--- a/src/syscall/zerrors_netbsd_arm.go
+++ b/src/syscall/zerrors_netbsd_arm.go
@@ -1403,6 +1403,7 @@ const (
WALTSIG = 0x4
WCLONE = 0x4
WCOREFLAG = 0x80
+ WEXITED = 0x20
WNOHANG = 0x1
WNOWAIT = 0x10000
WNOZOMBIE = 0x20000
diff --git a/src/syscall/zerrors_netbsd_arm64.go b/src/syscall/zerrors_netbsd_arm64.go
index e35bff7f3e..7adb72f7ed 100644
--- a/src/syscall/zerrors_netbsd_arm64.go
+++ b/src/syscall/zerrors_netbsd_arm64.go
@@ -1417,6 +1417,7 @@ const (
WALTSIG = 0x4
WCLONE = 0x4
WCOREFLAG = 0x80
+ WEXITED = 0x20
WNOHANG = 0x1
WNOWAIT = 0x10000
WNOZOMBIE = 0x20000
diff --git a/src/syscall/zsysnum_netbsd_386.go b/src/syscall/zsysnum_netbsd_386.go
index 4ff8d80341..fd0c329951 100644
--- a/src/syscall/zsysnum_netbsd_386.go
+++ b/src/syscall/zsysnum_netbsd_386.go
@@ -271,4 +271,5 @@ const (
SYS_POSIX_SPAWN = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
SYS_RECVMMSG = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
SYS_SENDMMSG = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+ SYS_WAIT6 = 481 // { int|sys||wait6(idtype_t idtype, id_t id, int *status, int options, struct wrusage *wru, siginfo_t *info); }
)
diff --git a/src/syscall/zsysnum_netbsd_amd64.go b/src/syscall/zsysnum_netbsd_amd64.go
index 929da07604..03f2cd3bd3 100644
--- a/src/syscall/zsysnum_netbsd_amd64.go
+++ b/src/syscall/zsysnum_netbsd_amd64.go
@@ -271,4 +271,5 @@ const (
SYS_POSIX_SPAWN = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
SYS_RECVMMSG = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
SYS_SENDMMSG = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+ SYS_WAIT6 = 481 // { int|sys||wait6(idtype_t idtype, id_t id, int *status, int options, struct wrusage *wru, siginfo_t *info); }
)
diff --git a/src/syscall/zsysnum_netbsd_arm.go b/src/syscall/zsysnum_netbsd_arm.go
index 998238518b..7b356e7102 100644
--- a/src/syscall/zsysnum_netbsd_arm.go
+++ b/src/syscall/zsysnum_netbsd_arm.go
@@ -271,4 +271,5 @@ const (
SYS_POSIX_SPAWN = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
SYS_RECVMMSG = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
SYS_SENDMMSG = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+ SYS_WAIT6 = 481 // { int|sys||wait6(idtype_t idtype, id_t id, int *status, int options, struct wrusage *wru, siginfo_t *info); }
)
diff --git a/src/syscall/zsysnum_netbsd_arm64.go b/src/syscall/zsysnum_netbsd_arm64.go
index b3f5034390..3f57ec4d89 100644
--- a/src/syscall/zsysnum_netbsd_arm64.go
+++ b/src/syscall/zsysnum_netbsd_arm64.go
@@ -271,4 +271,5 @@ const (
SYS_POSIX_SPAWN = 474 // { int|sys||posix_spawn(pid_t *pid, const char *path, const struct posix_spawn_file_actions *file_actions, const struct posix_spawnattr *attrp, char *const *argv, char *const *envp); }
SYS_RECVMMSG = 475 // { int|sys||recvmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags, struct timespec *timeout); }
SYS_SENDMMSG = 476 // { int|sys||sendmmsg(int s, struct mmsghdr *mmsg, unsigned int vlen, unsigned int flags); }
+ SYS_WAIT6 = 481 // { int|sys||wait6(idtype_t idtype, id_t id, int *status, int options, struct wrusage *wru, siginfo_t *info); }
)