From 4d72e8cbcba656dca7a3938275e9bd01d3116015 Mon Sep 17 00:00:00 2001
From: kercylan98 <kercylan@gmail.com>
Date: Wed, 20 Dec 2023 12:21:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=20server=20=E5=8C=85?=
 =?UTF-8?q?=E6=9C=AA=E4=BD=BF=E7=94=A8=20KCP=20=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E6=97=B6=E4=BC=9A=E6=9C=89=E9=A2=9D=E5=A4=96=E7=9A=84=E5=AE=9A?=
 =?UTF-8?q?=E6=97=B6=E5=99=A8=E6=8D=9F=E8=80=97=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 server/multiple.go    | 8 ++++++++
 server/server.go      | 4 ++++
 server/server_test.go | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/server/multiple.go b/server/multiple.go
index 602a0b7..0335a16 100644
--- a/server/multiple.go
+++ b/server/multiple.go
@@ -3,6 +3,7 @@ package server
 import (
 	"github.com/kercylan98/minotaur/utils/log"
 	"github.com/kercylan98/minotaur/utils/network"
+	"github.com/xtaci/kcp-go/v5"
 	"math"
 	"os"
 	"os/signal"
@@ -35,8 +36,12 @@ func (slf *MultipleServer) Run() {
 		close(runtimeExceptionChannel)
 	}()
 	var wait sync.WaitGroup
+	var hasKcp bool
 	for i := 0; i < len(slf.servers); i++ {
 		wait.Add(1)
+		if slf.servers[i].network == NetworkKcp {
+			hasKcp = true
+		}
 		go func(address string, server *Server) {
 			var lock sync.Mutex
 			var startFinish bool
@@ -62,6 +67,9 @@ func (slf *MultipleServer) Run() {
 		}(slf.addresses[i], slf.servers[i])
 	}
 	wait.Wait()
+	if !hasKcp {
+		kcp.SystemTimedSched.Close()
+	}
 
 	log.Info("Server", log.String(serverMultipleMark, "===================================================================="))
 	ip, _ := network.IP()
diff --git a/server/server.go b/server/server.go
index 48c4c3f..098337b 100644
--- a/server/server.go
+++ b/server/server.go
@@ -352,6 +352,10 @@ func (slf *Server) Run(addr string) error {
 		return ErrCanNotSupportNetwork
 	}
 
+	if slf.multiple == nil && slf.network != NetworkKcp {
+		kcp.SystemTimedSched.Close()
+	}
+
 	<-messageInitFinish
 	close(messageInitFinish)
 	messageInitFinish = nil
diff --git a/server/server_test.go b/server/server_test.go
index a79a03c..d06a3cc 100644
--- a/server/server_test.go
+++ b/server/server_test.go
@@ -11,7 +11,7 @@ import (
 
 func TestNew(t *testing.T) {
 	//limiter := rate.NewLimiter(rate.Every(time.Second), 100)
-	srv := server.New(server.NetworkWebsocket, server.WithMessageBufferSize(1024*1024), server.WithPProf())
+	srv := server.New(server.NetworkWebsocket, server.WithTicker(200, 10, false), server.WithMessageBufferSize(1024*1024), server.WithPProf())
 	//srv.RegMessageExecBeforeEvent(func(srv *server.Server, message *server.Message) bool {
 	//	t, c := srv.TimeoutContext(time.Second * 5)
 	//	defer c()