admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: 移除未使用的lockfree相关代码
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
Details

Browse Source
This commit is contained in:
xinian
2026-02-24 04:22:02 +08:00
committed by cnb
parent 3ac8ab2086
commit 05a1900d60
2 changed files with 25 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/socket/ServerEvent.go
View File

@@ -86,7 +86,7 @@ func (s *Server) OnClose(c gnet.Conn, err error) (action gnet.Action) {
//logging.Infof("conn[%v] disconnected", c.RemoteAddr().String())
v, _ := c.Context().(*player.ClientData)
v.LF.Close()
//v.LF.Close()
if v.Player != nil {
v.Player.Save() //保存玩家数据

50
logic/service/player/pack.go
View File

@@ -7,7 +7,6 @@ import (
"encoding/binary"
"encoding/hex"
"sync"
"time"
"context"
@@ -15,7 +14,6 @@ import (
"fmt"
"reflect"
"github.com/bruceshao/lockfree"
"github.com/gobwas/ws"
"github.com/gobwas/ws/wsutil"
"github.com/gogf/gf/v2/os/glog"
@@ -91,23 +89,23 @@ func XORDecryptU(encryptedData []byte, key uint32) []byte {
// 遍历结构体方法并执行RECV_cmd
func (h *ClientData) OnEvent(data common.TomeeHeader) {
defer func() {
if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值
// 1. 打印错误信息
if h.Player != nil {
if h.Player.Info != nil {
cool.Logger.Error(context.TODO(), "panic 错误：", cool.Config.ServerInfo.OnlineID, h.Player.Info.UserID, err)
} else {
cool.Logger.Error(context.TODO(), "panic 错误：", cool.Config.ServerInfo.OnlineID, err)
// defer func() {
// if err := recover(); err != nil { // 恢复 panic，err 为 panic 错误值
// // 1. 打印错误信息
// if h.Player != nil {
// if h.Player.Info != nil {
// cool.Logger.Error(context.TODO(), "panic 错误：", cool.Config.ServerInfo.OnlineID, h.Player.Info.UserID, err)
// } else {
// cool.Logger.Error(context.TODO(), "panic 错误：", cool.Config.ServerInfo.OnlineID, err)
}
// }
} else {
cool.Logger.Error(context.TODO(), "panic 错误：", err)
}
// } else {
// cool.Logger.Error(context.TODO(), "panic 错误：", err)
// }
}
}()
// }
// }()
if data.CMD > 1001 {
if h.Player == nil {
@@ -212,7 +210,7 @@ type ClientData struct {
ERROR_CONNUT int
Wsmsg *WsCodec
Conn gnet.Conn
LF *lockfree.Lockfree[common.TomeeHeader]
//LF *lockfree.Lockfree[common.TomeeHeader]
//SaveL sync.Once //保存锁
//SaveDone chan struct{}
@@ -227,19 +225,19 @@ func NewClientData(c gnet.Conn) *ClientData {
Conn: c,
Wsmsg: &WsCodec{},
}
cd.LF = lockfree.NewLockfree(
8,
cd,
lockfree.NewSleepBlockStrategy(time.Millisecond),
)
// 启动Lockfree
if err := cd.LF.Start(); err != nil {
panic(err)
}
// cd.LF = lockfree.NewLockfree(
// 8,
// cd,
// lockfree.NewSleepBlockStrategy(time.Millisecond),
// )
// // 启动Lockfree
// if err := cd.LF.Start(); err != nil {
// panic(err)
// }
// // // 启动Lockfree
// // if err := cd.LF.Start(); err != nil {
// // panic(err)
// // }
return cd
}