chore: merge upstream PR valyala#8 from valyala/tcplisten: z/OS Compa…

…tibility
ksw2000 · Dec 29, 2024 · 93114cc · 93114cc
1 parent 9d31554
commit 93114cc
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 3 deletions.
diff --git a/tcplisten/socket.go b/tcplisten/socket.go
@@ -1,4 +1,4 @@
-//go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || rumprun
+//go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || rumprun || (zos && s390x)
 
 package tcplisten
 

diff --git a/tcplisten/socket_zos_s390x.go b/tcplisten/socket_zos_s390x.go
@@ -0,0 +1,19 @@
+//go:build zos && s390x
+
+package tcplisten
+
+import (
+	"fmt"
+
+	"golang.org/x/sys/unix"
+)
+
+func newSocketCloexec(domain, typ, proto int) (int, error) {
+	fd, err := unix.Socket(domain, typ, proto)
+	_, err = unix.FcntlInt(uintptr(fd), unix.F_SETFD, unix.FD_CLOEXEC)
+	_, err = unix.FcntlInt(uintptr(fd), unix.F_SETFL, unix.O_NONBLOCK)
+	if err == nil {
+		return fd, nil
+	}
+	return -1, fmt.Errorf("cannot create listening unblocked socket: %s", err)
+}
diff --git a/tcplisten/tcplisten.go b/tcplisten/tcplisten.go
@@ -1,4 +1,4 @@
-//go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || rumprun
+//go:build linux || darwin || dragonfly || freebsd || netbsd || openbsd || rumprun || (zos && s390x)
 
 // Package tcplisten provides customizable TCP net.Listener with various
 // performance-related options:

diff --git a/tcplisten/tcplisten_bsd.go b/tcplisten/tcplisten_bsd.go
@@ -1,4 +1,4 @@
-//go:build darwin || dragonfly || freebsd || netbsd || openbsd || rumprun
+//go:build darwin || dragonfly || freebsd || netbsd || openbsd || rumprun || (zos && s390x)
 
 package tcplisten