Merge pull request #671 from panjf2000/dev

patch: v2.7.1
panjf2000 · Jan 5, 2025 · e907804 · e907804
2 parents a7e541b + e9a1101
commit e907804
Show file tree

Hide file tree

Showing 61 changed files with 181 additions and 92 deletions.
diff --git a/acceptor_unix.go b/acceptor_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package gnet
 

diff --git a/client_test.go b/client_test.go
@@ -1,5 +1,4 @@
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd || windows
-// +build darwin dragonfly freebsd linux netbsd openbsd windows
 
 package gnet
 

diff --git a/client_unix.go b/client_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package gnet
 

diff --git a/conn_map.go b/conn_map.go
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 //go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd) && !gc_opt
-// +build darwin dragonfly freebsd linux netbsd openbsd
-// +build !gc_opt
 
 package gnet
 

diff --git a/conn_matrix.go b/conn_matrix.go
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 //go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd) && gc_opt
-// +build darwin dragonfly freebsd linux netbsd openbsd
-// +build gc_opt
 
 package gnet
 

diff --git a/conn_matrix_test.go b/conn_matrix_test.go
@@ -1,6 +1,4 @@
 //go:build (darwin || dragonfly || freebsd || linux || netbsd || openbsd) && gc_opt
-// +build darwin dragonfly freebsd linux netbsd openbsd
-// +build gc_opt
 
 package gnet
 

diff --git a/connection_bsd.go b/connection_bsd.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
 
 package gnet
 

diff --git a/connection_unix.go b/connection_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package gnet
 

diff --git a/engine_unix.go b/engine_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package gnet
 

diff --git a/eventloop_unix.go b/eventloop_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package gnet
 

diff --git a/eventloop_unix_test.go b/eventloop_unix_test.go
@@ -1,5 +1,4 @@
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package gnet
 

diff --git a/listener_unix.go b/listener_unix.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package gnet
 

diff --git a/os_unix_test.go b/os_unix_test.go
@@ -1,5 +1,4 @@
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package gnet
 

diff --git a/os_windows_test.go b/os_windows_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 package gnet
 

diff --git a/pkg/io/io_bsd.go b/pkg/io/io_bsd.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
 
 package io
 

diff --git a/pkg/netpoll/defs_bsd_32bit.go b/pkg/netpoll/defs_bsd_32bit.go
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 //go:build (darwin || dragonfly || freebsd || netbsd || openbsd) && (386 || arm || mips || mipsle)
-// +build darwin dragonfly freebsd netbsd openbsd
-// +build 386 arm mips mipsle
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_bsd_64bit.go b/pkg/netpoll/defs_bsd_64bit.go
@@ -13,8 +13,6 @@
 // limitations under the License.
 
 //go:build (darwin || dragonfly || freebsd || netbsd || openbsd) && (amd64 || arm64 || ppc64 || ppc64le || mips64 || mips64le || riscv64)
-// +build darwin dragonfly freebsd netbsd openbsd
-// +build amd64 arm64 ppc64 ppc64le mips64 mips64le riscv64
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux.go b/pkg/netpoll/defs_linux.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build !poll_opt
-// +build !poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_386.go b/pkg/netpoll/defs_linux_386.go
@@ -2,7 +2,6 @@
 // cgo -cdefs defs2_linux.go
 
 //go:build poll_opt
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_amd64.go b/pkg/netpoll/defs_linux_amd64.go
@@ -2,7 +2,6 @@
 // cgo -cdefs defs_linux.go defs1_linux.go
 
 //go:build poll_opt
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_arm.go b/pkg/netpoll/defs_linux_arm.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build poll_opt
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_arm64.go b/pkg/netpoll/defs_linux_arm64.go
@@ -2,7 +2,6 @@
 // ../cmd/cgo/cgo -cdefs defs_linux.go defs1_linux.go defs2_linux.go
 
 //go:build poll_opt
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_mips64x.go b/pkg/netpoll/defs_linux_mips64x.go
@@ -3,9 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build (mips64 || mips64le) && linux && poll_opt
-// +build mips64 mips64le
-// +build linux
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_mipsx.go b/pkg/netpoll/defs_linux_mipsx.go
@@ -3,9 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build (mips || mipsle) && linux && poll_opt
-// +build mips mipsle
-// +build linux
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_ppc64.go b/pkg/netpoll/defs_linux_ppc64.go
@@ -2,7 +2,6 @@
 // cgo -cdefs defs_linux.go defs3_linux.go
 
 //go:build poll_opt
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_ppc64le.go b/pkg/netpoll/defs_linux_ppc64le.go
@@ -2,7 +2,6 @@
 // cgo -cdefs defs_linux.go defs3_linux.go
 
 //go:build poll_opt
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_riscv64.go b/pkg/netpoll/defs_linux_riscv64.go
@@ -3,7 +3,6 @@
 // go tool cgo -godefs defs_linux.go defs1_linux.go defs2_linux.go
 
 //go:build poll_opt
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_linux_s390x.go b/pkg/netpoll/defs_linux_s390x.go
@@ -3,7 +3,6 @@
 // license that can be found in the LICENSE file.
 
 //go:build poll_opt
-// +build poll_opt
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_poller.go b/pkg/netpoll/defs_poller.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || linux || netbsd || openbsd
-// +build darwin dragonfly freebsd linux netbsd openbsd
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_poller_bsd.go b/pkg/netpoll/defs_poller_bsd.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || openbsd
-// +build darwin dragonfly freebsd openbsd
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_poller_epoll.go b/pkg/netpoll/defs_poller_epoll.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build linux
-// +build linux
 
 package netpoll
 

diff --git a/pkg/netpoll/defs_poller_kqueue.go b/pkg/netpoll/defs_poller_kqueue.go
@@ -13,7 +13,6 @@
 // limitations under the License.
 
 //go:build darwin || dragonfly || freebsd || netbsd || openbsd
-// +build darwin dragonfly freebsd netbsd openbsd
 
 package netpoll