qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-26 14:08:37 -07:00
Code Releases Activity

net: use syscall.fcntl on libc systems

Browse Source 
Should fix the AIX builder.

Change-Id: I3498805fb2eee2f0ad50268b5afbbf091c5f6e63
Reviewed-on: https://go-review.googlesource.com/c/go/+/311650
Trust: Ian Lance Taylor <iant@golang.org>
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>
This commit is contained in:
Ian Lance Taylor 2021-04-19 18:39:52 -07:00
parent 0ccdcb2102
commit fe26dfadc3
3 changed files with 43 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/net/fcntl_libc_test.go Normal file
View File

@ -0,0 +1,14 @@
// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:build aix || darwin || solaris
// +build aix darwin solaris
package net
import _ "unsafe" // for go:linkname
// Implemented in the syscall package.
//go:linkname fcntl syscall.fcntl
func fcntl(fd int, cmd int, arg int) (int, error)

21
src/net/fcntl_syscall_test.go Normal file
View File

@ -0,0 +1,21 @@
// Copyright 2021 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
//go:build dragonfly || freebsd || linux || netbsd || openbsd
// +build dragonfly freebsd linux netbsd openbsd
package net
import (
"internal/syscall/unix"
"syscall"
)
func fcntl(fd int, cmd int, arg int) (int, error) {
r, _, e := syscall.Syscall(unix.FcntlSyscall, uintptr(fd), uintptr(cmd), uintptr(arg))
if e != 0 {
return int(r), syscall.Errno(e)
}
return int(r), nil
}

16
src/net/unixsock_readmsg_test.go
View File

@ -82,22 +82,22 @@ func TestUnixConnReadMsgUnixSCMRightsCloseOnExec(t *testing.T) {
t.Fatalf("got scms = %#v; expected 1 SocketControlMessage", scms) t.Fatalf("got scms = %#v; expected 1 SocketControlMessage", scms)
} }
scm := scms[0] scm := scms[0]
gotFds, err := syscall.ParseUnixRights(&scm) gotFDs, err := syscall.ParseUnixRights(&scm)
if err != nil { if err != nil {
t.Fatalf("syscall.ParseUnixRights: %v", err) t.Fatalf("syscall.ParseUnixRights: %v", err)
} }
if len(gotFds) != 1 { if len(gotFDs) != 1 {
t.Fatalf("got FDs %#v: wanted only 1 fd", gotFds) t.Fatalf("got FDs %#v: wanted only 1 fd", gotFDs)
} }
defer func() { defer func() {
if err := syscall.Close(int(gotFds[0])); err != nil { if err := syscall.Close(gotFDs[0]); err != nil {
t.Fatalf("fail to close gotFds: %v", err) t.Fatalf("fail to close gotFDs: %v", err)
} }
}() }()
flags, _, errno := syscall.Syscall(syscall.SYS_FCNTL, uintptr(gotFds[0]), uintptr(syscall.F_GETFD), 0) flags, err := fcntl(gotFDs[0], syscall.F_GETFD, 0)
if errno != 0 { if err != nil {
t.Fatalf("Can't get flags of fd:%#v, with err:%v", gotFds[0], errno) t.Fatalf("Can't get flags of fd:%#v, with err:%v", gotFDs[0], err)
} }
if flags&syscall.FD_CLOEXEC == 0 { if flags&syscall.FD_CLOEXEC == 0 {
t.Fatalf("got flags %#x, want %#x (FD_CLOEXEC) set", flags, syscall.FD_CLOEXEC) t.Fatalf("got flags %#x, want %#x (FD_CLOEXEC) set", flags, syscall.FD_CLOEXEC)