diff options
author | Tobias Klauser <tklauser@distanz.ch> | 2020-10-16 19:35:09 +0200 |
---|---|---|
committer | Tobias Klauser <tobias.klauser@gmail.com> | 2020-10-16 19:53:34 +0000 |
commit | 9cec50f50c29f5ef7264bf06ee7ac0991b4b36d6 (patch) | |
tree | bd7c698ab7341041dfee1bbb43f1be7473c1ca39 /src/syscall | |
parent | 41162be44a099803a870f9b6c147050594598d63 (diff) | |
download | go-9cec50f50c29f5ef7264bf06ee7ac0991b4b36d6.tar.gz go-9cec50f50c29f5ef7264bf06ee7ac0991b4b36d6.zip |
internal/poll, net, syscall: use accept4 on illumos
Illumos supports the accept4 syscall, use it in internal/poll.accept
like on other platforms.
Add Accept4 to package syscall despite the package being frozen. The
other option would have been to add this to internal/syscall/unix, but
adding it to syscall avoids duplicating a lot of code in internal/poll
and net/internal/socktest. Also, all other platforms supporting the
accept4 syscall already export Accept4.
Follow CL 97196, CL 40895 and CL 94295
Change-Id: I13b32f0163a683840c02b16722730d9dfdb98f56
Reviewed-on: https://go-review.googlesource.com/c/go/+/256101
Trust: Tobias Klauser <tobias.klauser@gmail.com>
Run-TryBot: Tobias Klauser <tobias.klauser@gmail.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/syscall')
-rw-r--r-- | src/syscall/syscall_illumos.go | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/src/syscall/syscall_illumos.go b/src/syscall/syscall_illumos.go index 1484337e1b..d70a436d13 100644 --- a/src/syscall/syscall_illumos.go +++ b/src/syscall/syscall_illumos.go @@ -10,11 +10,34 @@ package syscall import "unsafe" +//go:cgo_import_dynamic libc_accept4 accept4 "libsocket.so" //go:cgo_import_dynamic libc_flock flock "libc.so" +//go:linkname procAccept4 libc_accept4 //go:linkname procFlock libc_flock -var procFlock libcFunc +var ( + procAccept4, + procFlock libcFunc +) + +func Accept4(fd int, flags int) (int, Sockaddr, error) { + var rsa RawSockaddrAny + var addrlen _Socklen = SizeofSockaddrAny + nfd, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procAccept4)), 4, uintptr(fd), uintptr(unsafe.Pointer(&rsa)), uintptr(unsafe.Pointer(&addrlen)), uintptr(flags), 0, 0) + if errno != 0 { + return 0, nil, errno + } + if addrlen > SizeofSockaddrAny { + panic("RawSockaddrAny too small") + } + sa, err := anyToSockaddr(&rsa) + if err != nil { + Close(int(nfd)) + return 0, nil, err + } + return int(nfd), sa, nil +} func Flock(fd int, how int) error { _, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procFlock)), 2, uintptr(fd), uintptr(how), 0, 0, 0, 0) |