trifle: refine the usage of os.NewSyscallError

panjf2000 · Jul 18, 2020 · 2d54d80 · 2d54d80
1 parent 0c1bcb3
commit 2d54d80
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 32 deletions.
diff --git a/acceptor_unix.go b/acceptor_unix.go
@@ -36,8 +36,8 @@ func (svr *server) acceptNewConnection(fd int) error {
 		}
 		return os.NewSyscallError("accept", err)
 	}
-	if err := unix.SetNonblock(nfd, true); err != nil {
-		return os.NewSyscallError("fcntl nonblock", err)
+	if err = os.NewSyscallError("fcntl nonblock", unix.SetNonblock(nfd, true)); err != nil {
+		return err
 	}
 	el := svr.subEventLoopSet.next(nfd)
 	c := newTCPConn(nfd, el, sa)

diff --git a/eventloop_unix.go b/eventloop_unix.go
@@ -87,8 +87,8 @@ func (el *eventloop) loopAccept(fd int) error {
 			}
 			return os.NewSyscallError("accept", err)
 		}
-		if err = unix.SetNonblock(nfd, true); err != nil {
-			return os.NewSyscallError("fcntl nonblock", err)
+		if err = os.NewSyscallError("fcntl nonblock", unix.SetNonblock(nfd, true)); err != nil {
+			return err
 		}
 		c := newTCPConn(nfd, el, sa)
 		if err = el.poller.AddRead(c.fd); err == nil {

diff --git a/internal/netpoll/epoll.go b/internal/netpoll/epoll.go
@@ -66,8 +66,8 @@ func OpenPoller() (poller *Poller, err error) {
 
 // Close closes the poller.
 func (p *Poller) Close() error {
-	if err := unix.Close(p.fd); err != nil {
-		return os.NewSyscallError("close", err)
+	if err := os.NewSyscallError("close", unix.Close(p.fd)); err != nil {
+		return err
 	}
 	return os.NewSyscallError("close", unix.Close(p.wfd))
 }

diff --git a/internal/netpoll/netpoll_darwin.go b/internal/netpoll/netpoll_darwin.go
@@ -29,13 +29,13 @@ import (
 
 // SetKeepAlive sets the keepalive for the connection.
 func SetKeepAlive(fd, secs int) error {
-	if err := unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_KEEPALIVE, 1); err != nil {
-		return os.NewSyscallError("setsockopt", err)
+	if err := os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_KEEPALIVE, 1)); err != nil {
+		return err
 	}
-	switch err := unix.SetsockoptInt(fd, unix.IPPROTO_TCP, unix.TCP_KEEPINTVL, secs); err {
+	switch err := os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.IPPROTO_TCP, unix.TCP_KEEPINTVL, secs)); err {
 	case nil, unix.ENOPROTOOPT: // OS X 10.7 and earlier don't support this option
 	default:
-		return os.NewSyscallError("setsockopt", err)
+		return err
 	}
 	return os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.IPPROTO_TCP, unix.TCP_KEEPALIVE, secs))
 }
diff --git a/internal/netpoll/netpoll_unix.go b/internal/netpoll/netpoll_unix.go
@@ -31,11 +31,11 @@ import (
 
 // SetKeepAlive sets the keepalive for the connection.
 func SetKeepAlive(fd, secs int) error {
-	if err := unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_KEEPALIVE, 1); err != nil {
-		return os.NewSyscallError("setsockopt", err)
+	if err := os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_KEEPALIVE, 1)); err != nil {
+		return err
 	}
-	if err := unix.SetsockoptInt(fd, unix.IPPROTO_TCP, unix.TCP_KEEPINTVL, secs); err != nil {
-		return os.NewSyscallError("setsockopt", err)
+	if err := os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.IPPROTO_TCP, unix.TCP_KEEPINTVL, secs)); err != nil {
+		return err
 	}
 	return os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.IPPROTO_TCP, unix.TCP_KEEPIDLE, secs))
 }
diff --git a/internal/reuseport/tcp.go b/internal/reuseport/tcp.go
@@ -129,20 +129,17 @@ func tcpReusablePort(proto, addr string, reusePort bool) (fd int, netAddr net.Ad
 		}
 	}()
 
-	if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEADDR, 1); err != nil {
-		err = os.NewSyscallError("setsockopt", err)
+	if err = os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)); err != nil {
 		return
 	}
 
 	if reusePort {
-		if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEPORT, 1); err != nil {
-			err = os.NewSyscallError("setsockopt", err)
+		if err = os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)); err != nil {
 			return
 		}
 	}
 
-	if err = unix.Bind(fd, sockaddr); err != nil {
-		err = os.NewSyscallError("bind", err)
+	if err = os.NewSyscallError("bind", unix.Bind(fd, sockaddr)); err != nil {
 		return
 	}
 

diff --git a/internal/reuseport/udp.go b/internal/reuseport/udp.go
@@ -128,19 +128,16 @@ func udpReusablePort(proto, addr string, reusePort bool) (fd int, netAddr net.Ad
 	}()
 
 	// Allow broadcast.
-	if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_BROADCAST, 1); err != nil {
-		err = os.NewSyscallError("setsockopt", err)
+	if err = os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_BROADCAST, 1)); err != nil {
 		return
 	}
 
-	if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEADDR, 1); err != nil {
-		err = os.NewSyscallError("setsockopt", err)
+	if err = os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)); err != nil {
 		return
 	}
 
 	if reusePort {
-		if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEPORT, 1); err != nil {
-			err = os.NewSyscallError("setsockopt", err)
+		if err = os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)); err != nil {
 			return
 		}
 	}

diff --git a/internal/reuseport/uds.go b/internal/reuseport/uds.go
@@ -68,20 +68,17 @@ func udsReusablePort(proto, addr string, reusePort bool) (fd int, netAddr net.Ad
 		}
 	}()
 
-	if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEADDR, 1); err != nil {
-		err = os.NewSyscallError("setsockopt", err)
+	if err = os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEADDR, 1)); err != nil {
 		return
 	}
 
 	if reusePort {
-		if err = unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEPORT, 1); err != nil {
-			err = os.NewSyscallError("setsockopt", err)
+		if err = os.NewSyscallError("setsockopt", unix.SetsockoptInt(fd, unix.SOL_SOCKET, unix.SO_REUSEPORT, 1)); err != nil {
 			return
 		}
 	}
 
-	if err = unix.Bind(fd, sockaddr); err != nil {
-		err = os.NewSyscallError("bind", err)
+	if err = os.NewSyscallError("bind", unix.Bind(fd, sockaddr)); err != nil {
 		return
 	}