Merge pull request #706 from panjf2000/dev

minor: v2.8.0

Author: panjf2000

conn_matrix_test.go

@@ -6,6 +6,7 @@ import (
 	"net"
 	"testing"
 
+	"github.com/stretchr/testify/require"
 	"golang.org/x/sys/unix"
 
 	goPool "github.com/panjf2000/gnet/v2/pkg/pool/goroutine"
@@ -51,7 +52,7 @@ func testConnMatrix(t *testing.T, n int) {
 	el := eventloop{engine: &engine{opts: &Options{}}}
 
 	done := make(chan struct{})
-	go func() {
+	err := goPool.DefaultWorkerPool.Submit(func() {
 		for i := 0; i < n+n/2; i++ {
 			v := <-handleConns
 			switch v.action {
@@ -62,14 +63,14 @@ func testConnMatrix(t *testing.T, n int) {
 			}
 		}
 		close(done)
-	}()
+	})
+	require.NoError(t, err)
 
-	pool := goPool.Default()
 	for i := 0; i < n; i++ {
 		c := newTCPConn(i, &el, &unix.SockaddrInet4{}, &net.TCPAddr{}, &net.TCPAddr{})
 		handleConns <- &handleConn{c, actionAdd}
 		if i%2 == 0 {
-			pool.Submit(func() {
+			_ = goPool.DefaultWorkerPool.Submit(func() {
 				handleConns <- &handleConn{c, actionDel}
 			})
 		}

eventloop_unix_test.go

@@ -14,6 +14,8 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/stretchr/testify/assert"
+
+	goPool "github.com/panjf2000/gnet/v2/pkg/pool/goroutine"
 )
 
 func (lb *roundRobinLoadBalancer) register(el *eventloop) {
@@ -98,7 +100,7 @@ func benchServeGC(b *testing.B, network, addr string, async bool, elNum int, ini
 	}
 
 	nowEventLoopInitConn = initConnCount
-	go func() {
+	_ = goPool.DefaultWorkerPool.Submit(func() {
 		err := Run(ts,
 			network+"://"+addr,
 			WithLockOSThread(async),
@@ -107,7 +109,7 @@ func benchServeGC(b *testing.B, network, addr string, async bool, elNum int, ini
 			WithTCPNoDelay(TCPDelay))
 		assert.NoError(b, err)
 		nowEventLoopInitConn = 0
-	}()
+	})
 	<-ts.initOk
 	return ts
 }
@@ -126,12 +128,12 @@ type benchmarkServerGC struct {
 
 func (s *benchmarkServerGC) OnBoot(eng Engine) (action Action) {
 	s.eng = eng
-	go func() {
+	_ = goPool.DefaultWorkerPool.Submit(func() {
 		for s.eng.eng.eventLoops.len() != s.elNum || s.eng.CountConnections() != s.elNum*int(s.initConnCount) {
 			time.Sleep(time.Millisecond)
 		}
 		close(s.initOk)
-	}()
+	})
 	return
 }
 
@@ -253,7 +255,10 @@ func (s *testServerGC) OnBoot(eng Engine) (action Action) {
 	if testBigGC {
 		gcSecs = 10
 	}
-	go s.GC(gcSecs)
+	err := goPool.DefaultWorkerPool.Submit(func() {
+		s.GC(gcSecs)
+	})
+	assert.NoError(s.tester, err)
 
 	return
 }

go.mod

@@ -1,7 +1,7 @@
 module github.com/panjf2000/gnet/v2
 
 require (
-	github.com/panjf2000/ants/v2 v2.11.0
+	github.com/panjf2000/ants/v2 v2.11.3
 	github.com/stretchr/testify v1.10.0
 	github.com/valyala/bytebufferpool v1.0.0
 	go.uber.org/zap v1.27.0
@@ -18,4 +18,3 @@ require (
 )
 
 go 1.20
-

go.sum

@@ -1,7 +1,7 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/panjf2000/ants/v2 v2.11.0 h1:sHrqEwTBQTQ2w6PMvbMfvBtVUuhsaYPzUmAYDLYmJPg=
-github.com/panjf2000/ants/v2 v2.11.0/go.mod h1:V9HhTupTWxcaRmIglJvGwvzqXUTnIZW9uO6q4hAfApw=
+github.com/panjf2000/ants/v2 v2.11.3 h1:AfI0ngBoXJmYOpDh9m516vjqoUu2sLrIVgppI9TZVpg=
+github.com/panjf2000/ants/v2 v2.11.3/go.mod h1:8u92CYMUc6gyvTIw8Ru7Mt7+/ESnJahz5EVtqfrilek=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=

os_unix_test.go

@@ -22,6 +22,7 @@ import (
 
 	errorx "github.com/panjf2000/gnet/v2/pkg/errors"
 	"github.com/panjf2000/gnet/v2/pkg/logging"
+	goPool "github.com/panjf2000/gnet/v2/pkg/pool/goroutine"
 )
 
 var (
@@ -150,10 +151,11 @@ func (s *testMcastServer) OnTick() (delay time.Duration, action Action) {
 	if atomic.CompareAndSwapInt32(&s.started, 0, 1) {
 		for i := 0; i < s.nclients; i++ {
 			atomic.AddInt32(&s.active, 1)
-			go func() {
+			err := goPool.DefaultWorkerPool.Submit(func() {
 				defer atomic.AddInt32(&s.active, -1)
 				s.startMcastClient()
-			}()
+			})
+			assert.NoError(s.t, err)
 		}
 	}
 	if atomic.LoadInt32(&s.active) == 0 {