chenyh
/
vRp.CD2g_test
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

关闭逻辑优化

This commit is contained in:
kercylan98 2023-05-24 11:25:31 +08:00
parent 1913c4d3ca
commit 6680a348c9
2 changed files with 37 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
examples/simple-server-lockstep-monitor/main.go
View File

@ -5,6 +5,7 @@ import (
"github.com/kercylan98/minotaur/game/builtin"
"github.com/kercylan98/minotaur/server"
"github.com/kercylan98/minotaur/utils/log"
"github.com/kercylan98/minotaur/utils/random"
"github.com/kercylan98/minotaur/utils/synchronization"
"github.com/kercylan98/minotaur/utils/timer"
"go.uber.org/zap"
@ -32,47 +33,47 @@ func main() {
)
lockstep := components.NewLockstep[string, *Command]()
srv.RegStartFinishEvent(func(srv *server.Server) {
srv.Ticker().Loop("monitor", timer.Instantly, time.Second, timer.Forever, func() {
srv.Ticker().Loop("monitor", timer.Instantly, time.Second/2, timer.Forever, func() {
m := srv.GetMonitor()
log.Info("Monitor.Message",
zap.Any("MessageTotal", m.MessageTotal()),
zap.Any("MessageSecond", m.MessageSecond()),
zap.Any("MessageCost", m.MessageCost()),
zap.Any("MessageDoneAvg", m.MessageDoneAvg()),
zap.Any("MessageQPS", m.MessageQPS()),
zap.Any("MessageTopQPS", m.MessageTopQPS()),
zap.Any("Total", m.MessageTotal()),
zap.Any("Second", m.MessageSecond()),
zap.Any("Cost", m.MessageCost()),
zap.Any("DoneAvg", m.MessageDoneAvg()),
zap.Any("QPS", m.MessageQPS()),
zap.Any("TopQPS", m.MessageTopQPS()),
)
log.Info("Monitor.Cross",
zap.Any("CrossMessageTotal", m.CrossMessageTotal()),
zap.Any("CrossMessageSecond", m.CrossMessageSecond()),
zap.Any("CrossMessageCost", m.CrossMessageCost()),
zap.Any("CrossMessageDoneAvg", m.CrossMessageDoneAvg()),
zap.Any("CrossMessageQPS", m.MessageQPS()),
zap.Any("CrossMessageTopQPS", m.CrossMessageTopQPS()),
zap.Any("Total", m.CrossMessageTotal()),
zap.Any("Second", m.CrossMessageSecond()),
zap.Any("Cost", m.CrossMessageCost()),
zap.Any("DoneAvg", m.CrossMessageDoneAvg()),
zap.Any("QPS", m.MessageQPS()),
zap.Any("TopQPS", m.CrossMessageTopQPS()),
)
log.Info("Monitor.Packet",
zap.Any("PacketMessageTotal", m.PacketMessageTotal()),
zap.Any("PacketMessageSecond", m.PacketMessageSecond()),
zap.Any("PacketMessageCost", m.PacketMessageCost()),
zap.Any("PacketMessageDoneAvg", m.PacketMessageDoneAvg()),
zap.Any("PacketMessageQPS", m.PacketMessageQPS()),
zap.Any("PacketMessageTopQPS", m.PacketMessageTopQPS()),
zap.Any("Total", m.PacketMessageTotal()),
zap.Any("Second", m.PacketMessageSecond()),
zap.Any("Cost", m.PacketMessageCost()),
zap.Any("DoneAvg", m.PacketMessageDoneAvg()),
zap.Any("QPS", m.PacketMessageQPS()),
zap.Any("TopQPS", m.PacketMessageTopQPS()),
)
log.Info("Monitor.Ticker",
zap.Any("TickerMessageTotal", m.TickerMessageTotal()),
zap.Any("TickerMessageSecond", m.TickerMessageSecond()),
zap.Any("TickerMessageCost", m.TickerMessageCost()),
zap.Any("TickerMessageDoneAvg", m.TickerMessageDoneAvg()),
zap.Any("TickerMessageQPS", m.TickerMessageQPS()),
zap.Any("TickerMessageTopQPS", m.TickerMessageTopQPS()),
zap.Any("Total", m.TickerMessageTotal()),
zap.Any("Second", m.TickerMessageSecond()),
zap.Any("Cost", m.TickerMessageCost()),
zap.Any("DoneAvg", m.TickerMessageDoneAvg()),
zap.Any("QPS", m.TickerMessageQPS()),
zap.Any("TopQPS", m.TickerMessageTopQPS()),
)
log.Info("Monitor.Error",
zap.Any("ErrorMessageTotal", m.ErrorMessageTotal()),
zap.Any("ErrorMessageSecond", m.ErrorMessageSecond()),
zap.Any("ErrorMessageCost", m.ErrorMessageCost()),
zap.Any("ErrorMessageDoneAvg", m.ErrorMessageDoneAvg()),
zap.Any("ErrorMessageQPS", m.ErrorMessageQPS()),
zap.Any("ErrorMessageTopQPS", m.ErrorMessageTopQPS()),
zap.Any("Total", m.ErrorMessageTotal()),
zap.Any("Second", m.ErrorMessageSecond()),
zap.Any("Cost", m.ErrorMessageCost()),
zap.Any("DoneAvg", m.ErrorMessageDoneAvg()),
zap.Any("QPS", m.ErrorMessageQPS()),
zap.Any("TopQPS", m.ErrorMessageTopQPS()),
)
})
})
@ -93,6 +94,7 @@ func main() {
case "start":
lockstep.StartBroadcast()
default:
time.Sleep(random.Duration(1, 3) * time.Second)
lockstep.AddCommand(&Command{CMD: 1, Data: string(packet)})
}
})

6
server/server.go
View File

@ -30,7 +30,7 @@ func New(network Network, options ...Option) *Server {
network: network,
options: options,
core: 1,
closeChannel: make(chan struct{}),
closeChannel: make(chan struct{}, 1),
websocketWriteMessageType: WebsocketMessageTypeBinary,
}
server.event.Server = server
@ -294,9 +294,11 @@ func (slf *Server) Run(addr string) error {
select {
case <-systemSignal:
slf.Shutdown(nil)
}
select {
case <-slf.closeChannel:
close(slf.closeChannel)
break
}
} else {
slf.OnStartFinishEvent()