trifle: refine go build tags of operating systems

panjf2000 · Jul 3, 2020 · 637144b · 637144b
1 parent c3907e0
commit 637144b
Show file tree

Hide file tree

Showing 26 changed files with 31 additions and 72 deletions.
diff --git a/README.md b/README.md
@@ -3,14 +3,14 @@
 <br />
 <a title="Build Status" target="_blank" href="https://travis-ci.com/panjf2000/gnet"><img src="https://img.shields.io/travis/com/panjf2000/gnet?style=flat-square&logo=travis-ci&logoColor=white"></a>
 <a title="Codecov" target="_blank" href="https://codecov.io/gh/panjf2000/gnet"><img src="https://img.shields.io/codecov/c/github/panjf2000/gnet?style=flat-square&logo=codecov"></a>
-<a title="Supported Platforms" target="_blank" href="https://github.com/panjf2000/gnet"><img src="https://img.shields.io/badge/platform-Linux%20%7C%20FreeBSD%20%7C%20Darwin%20%7C%20Windows-549688?style=flat-square&logo=dlna"></a>
+<a title="Supported Platforms" target="_blank" href="https://github.com/panjf2000/gnet"><img src="https://img.shields.io/badge/platform-Linux%20%7C%20FreeBSD%20%7C%20DragonFly%20%7C%20Darwin%20%7C%20Windows-549688?style=flat-square&logo=dlna"></a>
 <a title="Require Go Version" target="_blank" href="https://github.com/panjf2000/gnet"><img src="https://img.shields.io/badge/go-%3E%3D1.9-30dff3?style=flat-square&logo=go"></a>
-<a title="Release" target="_blank" href="https://github.com/panjf2000/gnet/releases"><img src="https://img.shields.io/github/v/release/panjf2000/gnet.svg?color=161823&style=flat-square&logo=smartthings"></a>
 <br/>
 <a title="Go Report Card" target="_blank" href="https://goreportcard.com/report/github.com/panjf2000/gnet"><img src="https://goreportcard.com/badge/github.com/panjf2000/gnet?style=flat-square"></a>
 <a title="Doc for gnet" target="_blank" href="https://pkg.go.dev/github.com/panjf2000/gnet?tab=doc"><img src="https://img.shields.io/badge/go.dev-doc-007d9c?style=flat-square&logo=read-the-docs"></a>
 <a title="gnet on Sourcegraph" target="_blank" href="https://sourcegraph.com/github.com/panjf2000/gnet?badge"><img src="https://sourcegraph.com/github.com/panjf2000/gnet/-/badge.svg?style=flat-square"></a>
 <a title="Mentioned in Awesome Go" target="_blank" href="https://github.com/avelino/awesome-go#networking"><img src="https://awesome.re/mentioned-badge-flat.svg"></a>
+<a title="Release" target="_blank" href="https://github.com/panjf2000/gnet/releases"><img src="https://img.shields.io/github/v/release/panjf2000/gnet.svg?color=161823&style=flat-square&logo=smartthings"></a>
 </p>
 
 English | [🇨🇳中文](README_ZH.md)

diff --git a/README_ZH.md b/README_ZH.md
@@ -3,14 +3,14 @@
 <br />
 <a title="Build Status" target="_blank" href="https://travis-ci.com/panjf2000/gnet"><img src="https://img.shields.io/travis/com/panjf2000/gnet?style=flat-square&logo=travis-ci&logoColor=white"></a>
 <a title="Codecov" target="_blank" href="https://codecov.io/gh/panjf2000/gnet"><img src="https://img.shields.io/codecov/c/github/panjf2000/gnet?style=flat-square&logo=codecov"></a>
-<a title="Supported Platforms" target="_blank" href="https://github.com/panjf2000/gnet"><img src="https://img.shields.io/badge/platform-Linux%20%7C%20FreeBSD%20%7C%20Darwin%20%7C%20Windows-549688?style=flat-square&logo=dlna"></a>
+<a title="Supported Platforms" target="_blank" href="https://github.com/panjf2000/gnet"><img src="https://img.shields.io/badge/platform-Linux%20%7C%20FreeBSD%20%7C%20DragonFly%20%7C%20Darwin%20%7C%20Windows-549688?style=flat-square&logo=dlna"></a>
 <a title="Require Go Version" target="_blank" href="https://github.com/panjf2000/gnet"><img src="https://img.shields.io/badge/go-%3E%3D1.9-30dff3?style=flat-square&logo=go"></a>
-<a title="Release" target="_blank" href="https://github.com/panjf2000/gnet/releases"><img src="https://img.shields.io/github/v/release/panjf2000/gnet.svg?color=161823&style=flat-square&logo=smartthings"></a>
 <br/>
 <a title="Go Report Card" target="_blank" href="https://goreportcard.com/report/github.com/panjf2000/gnet"><img src="https://goreportcard.com/badge/github.com/panjf2000/gnet?style=flat-square"></a>
 <a title="Doc for gnet" target="_blank" href="https://pkg.go.dev/github.com/panjf2000/gnet?tab=doc"><img src="https://img.shields.io/badge/go.dev-doc-007d9c?style=flat-square&logo=read-the-docs"></a>
 <a title="gnet on Sourcegraph" target="_blank" href="https://sourcegraph.com/github.com/panjf2000/gnet?badge"><img src="https://sourcegraph.com/github.com/panjf2000/gnet/-/badge.svg?style=flat-square"></a>
 <a title="Mentioned in Awesome Go" target="_blank" href="https://github.com/avelino/awesome-go#networking"><img src="https://awesome.re/mentioned-badge-flat.svg"></a>
+<a title="Release" target="_blank" href="https://github.com/panjf2000/gnet/releases"><img src="https://img.shields.io/github/v/release/panjf2000/gnet.svg?color=161823&style=flat-square&logo=smartthings"></a>
 </p>
 
 [英文](README.md) | 🇨🇳中文

diff --git a/acceptor_unix.go b/acceptor_unix.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package gnet
 

diff --git a/acceptor_windows.go b/acceptor_windows.go
@@ -3,8 +3,6 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build windows
-
 package gnet
 
 import (

diff --git a/connection_unix.go b/connection_unix.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package gnet
 

diff --git a/connection_windows.go b/connection_windows.go
@@ -3,8 +3,6 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build windows
-
 package gnet
 
 import (

diff --git a/eventloop_unix.go b/eventloop_unix.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package gnet
 

diff --git a/eventloop_windows.go b/eventloop_windows.go
@@ -3,8 +3,6 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build windows
-
 package gnet
 
 import (

diff --git a/internal/netpoll/kqueue.go b/internal/netpoll/kqueue.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-// +build darwin netbsd freebsd openbsd dragonfly
+// +build freebsd dragonfly darwin
 
 package netpoll
 

diff --git a/internal/netpoll/kqueue_events.go b/internal/netpoll/kqueue_events.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-// +build darwin netbsd freebsd openbsd dragonfly
+// +build freebsd dragonfly darwin
 
 package netpoll
 

diff --git a/internal/netpoll/netpoll_stub.go b/internal/netpoll/netpoll_stub.go
diff --git a/internal/netpoll/netpoll_unix.go b/internal/netpoll/netpoll_unix.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build linux netbsd freebsd dragonfly
+// +build linux freebsd dragonfly
 
 package netpoll
 

diff --git a/internal/netpoll/socktoaddr.go b/internal/netpoll/socktoaddr.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package netpoll
 

diff --git a/internal/reuseport/reuseport.go b/internal/reuseport/reuseport.go
@@ -17,7 +17,7 @@
 // Package reuseport provides a function that returns fd and net.Listener powered
 // by a net.FileListener with a SO_REUSEPORT option set to the socket.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package reuseport
 

diff --git a/internal/reuseport/reuseport_bsd.go b/internal/reuseport/reuseport_bsd.go
@@ -14,7 +14,7 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-// +build darwin netbsd freebsd openbsd dragonfly
+// +build freebsd dragonfly darwin
 
 package reuseport
 
@@ -34,10 +34,6 @@ func maxListenerBacklog() int {
 		n, err = unix.SysctlUint32("kern.ipc.somaxconn")
 	case "freebsd":
 		n, err = unix.SysctlUint32("kern.ipc.soacceptqueue")
-	case "netbsd":
-		// NOTE: NetBSD has no somaxconn-like kernel state so far
-	case "openbsd":
-		n, err = unix.SysctlUint32("kern.somaxconn")
 	}
 	if n == 0 || err != nil {
 		return unix.SOMAXCONN

diff --git a/internal/reuseport/sock_cloexec.go b/internal/reuseport/sock_cloexec.go
@@ -13,7 +13,7 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-// +build linux netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly
 
 package reuseport
 

diff --git a/internal/reuseport/tcp.go b/internal/reuseport/tcp.go
@@ -14,7 +14,7 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package reuseport
 

diff --git a/internal/reuseport/udp.go b/internal/reuseport/udp.go
@@ -14,7 +14,7 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package reuseport
 

diff --git a/internal/reuseport/uds.go b/internal/reuseport/uds.go
@@ -13,7 +13,7 @@
 // TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 // THE SOFTWARE.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package reuseport
 

diff --git a/listener_unix.go b/listener_unix.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package gnet
 

diff --git a/listener_windows.go b/listener_windows.go
@@ -3,8 +3,6 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build windows
-
 package gnet
 
 import (

diff --git a/loop_bsd.go b/loop_bsd.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build darwin netbsd freebsd openbsd dragonfly
+// +build freebsd dragonfly darwin
 
 package gnet
 

diff --git a/reactor_bsd.go b/reactor_bsd.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build darwin netbsd freebsd openbsd dragonfly
+// +build freebsd dragonfly darwin
 
 package gnet
 

diff --git a/server_stub.go b/server_stub.go
@@ -3,12 +3,10 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build !darwin,!netbsd,!freebsd,!openbsd,!dragonfly,!linux,!windows
+// +build !linux,!freebsd,!dragonfly,!darwin,!windows
 
 package gnet
 
-import "net"
-
 type server struct {
 	subEventLoopSet loadBalancer // event-loops for handling events
 }
@@ -18,19 +16,23 @@ type eventloop struct {
 }
 
 type listener struct {
-	ln            net.Listener
-	pconn         net.PacketConn
-	lnaddr        net.Addr
+	reusePort     bool
 	addr, network string
 }
 
-func (ln *listener) renormalize() error {
+func (ln *listener) normalize() error {
 	return nil
 }
 
 func (ln *listener) close() {
 }
 
-func serve(eventHandler EventHandler, listeners *listener, options *Options) error {
+func initListener(network, addr string, reusePort bool) (l *listener, err error) {
+	l = &listener{network: network, addr: addr, reusePort: reusePort}
+	err = l.normalize()
+	return
+}
+
+func serve(_ EventHandler, _ *listener, _ *Options) error {
 	return ErrUnsupportedPlatform
 }
diff --git a/server_unix.go b/server_unix.go
@@ -3,7 +3,7 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build linux darwin netbsd freebsd openbsd dragonfly
+// +build linux freebsd dragonfly darwin
 
 package gnet
 

diff --git a/server_windows.go b/server_windows.go
@@ -3,8 +3,6 @@
 // Use of this source code is governed by an MIT-style
 // license that can be found in the LICENSE file.
 
-// +build windows
-
 package gnet
 
 import (