From 1ae2218a11038222baae03829833729d95c82a0c Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 14 Sep 2023 22:28:35 +0800
Subject: [PATCH] 1

---
 server/hallserver/app/app.go | 41 +++++++++++++++++-------------------
 server/imserver/app.go       | 41 +++++++++++++++++-------------------
 third_party/f5               |  2 +-
 third_party/q5               |  2 +-
 4 files changed, 40 insertions(+), 46 deletions(-)

diff --git a/server/hallserver/app/app.go b/server/hallserver/app/app.go
index 42008aac..79ce4c49 100644
--- a/server/hallserver/app/app.go
+++ b/server/hallserver/app/app.go
@@ -44,32 +44,29 @@ func (this *app) UnInit() {
 func (this *app) Update() {
 	this.netMsgQueue.Fetch()
 	for !this.netMsgQueue.WorkList.Empty() {
-		next := this.netMsgQueue.WorkList.Next()
-		hdr, ok := next.GetData().(*f5.MsgHdr)
-		if ok {
-			if hdr.MsgId < f5.WSP_SS_MAX_MSGID {
-				handler := ss.GetNetMsgHandler(hdr.MsgId)
-				if handler != nil {
-					switch handler.HandlerId {
-					case constant.WSP_LISTENER_HANDLER_ID:
-						GetWspListener().ProcessSSMMsg(handler, hdr)
-					}
+		hdr := this.netMsgQueue.WorkList.FirstEntry().(*f5.MsgHdr)
+		hdr.Entry.DelInit()
+		if hdr.MsgId < f5.WSP_SS_MAX_MSGID {
+			handler := ss.GetNetMsgHandler(hdr.MsgId)
+			if handler != nil {
+				switch handler.HandlerId {
+				case constant.WSP_LISTENER_HANDLER_ID:
+					GetWspListener().ProcessSSMMsg(handler, hdr)
 				}
-			} else {
-				handler := cs.GetNetMsgHandler(hdr.MsgId)
-				if handler != nil {
-					switch handler.HandlerId {
-					case constant.PLAYER_MGR_HANDLER_ID:
-					case constant.PLAYER_HANDLER_ID:
-						GetPlayerMgr().ProcessCMMsg(handler, hdr)
-					case constant.ROOM_HANDLER_ID:
-					case constant.ROOM_MGR_HANDLER_ID:
-						GetRoomMgr().ProcessCMMsg(handler, hdr)
-					}
+			}
+		} else {
+			handler := cs.GetNetMsgHandler(hdr.MsgId)
+			if handler != nil {
+				switch handler.HandlerId {
+				case constant.PLAYER_MGR_HANDLER_ID:
+				case constant.PLAYER_HANDLER_ID:
+					GetPlayerMgr().ProcessCMMsg(handler, hdr)
+				case constant.ROOM_HANDLER_ID:
+				case constant.ROOM_MGR_HANDLER_ID:
+					GetRoomMgr().ProcessCMMsg(handler, hdr)
 				}
 			}
 		}
-		next.Del()
 	}
 }
 
diff --git a/server/imserver/app.go b/server/imserver/app.go
index dba9d535..b176b722 100644
--- a/server/imserver/app.go
+++ b/server/imserver/app.go
@@ -41,33 +41,30 @@ func (this *App) UnInit() {
 func (this *App) Update() {
 	this.netMsgQueue.Fetch()
 	for !this.netMsgQueue.WorkList.Empty() {
-		next := this.netMsgQueue.WorkList.Next()
-		hdr, ok := next.GetData().(*f5.MsgHdr)
-		if ok {
-			if hdr.MsgId < f5.WSP_SS_MAX_MSGID {
-				handler := ss.GetNetMsgHandler(hdr.MsgId)
-				if handler != nil {
-					switch handler.HandlerId {
-					case WSP_LISTENER_HANDLER_ID:
-						ss.DispatchMsg(handler, hdr, wspListener)
-					}
+		hdr := this.netMsgQueue.WorkList.FirstEntry().(*f5.MsgHdr)
+		hdr.Entry.DelInit()
+		if hdr.MsgId < f5.WSP_SS_MAX_MSGID {
+			handler := ss.GetNetMsgHandler(hdr.MsgId)
+			if handler != nil {
+				switch handler.HandlerId {
+				case WSP_LISTENER_HANDLER_ID:
+					ss.DispatchMsg(handler, hdr, wspListener)
 				}
-			} else {
-				handler := cs.GetNetMsgHandler(hdr.MsgId)
-				if handler != nil {
-					switch handler.HandlerId {
-					case PLAYER_MGR_HANDLER_ID:
-						cs.DispatchMsg(handler, hdr, playerMgr)
-					case PLAYER_HANDLER_ID:
-						player := playerMgr.getPlayerBySocket(hdr.GetSocket())
-						if player != nil {
-							cs.DispatchMsg(handler, hdr, player)
-						}
+			}
+		} else {
+			handler := cs.GetNetMsgHandler(hdr.MsgId)
+			if handler != nil {
+				switch handler.HandlerId {
+				case PLAYER_MGR_HANDLER_ID:
+					cs.DispatchMsg(handler, hdr, playerMgr)
+				case PLAYER_HANDLER_ID:
+					player := playerMgr.getPlayerBySocket(hdr.GetSocket())
+					if player != nil {
+						cs.DispatchMsg(handler, hdr, player)
 					}
 				}
 			}
 		}
-		next.Del()
 	}
 }
 
diff --git a/third_party/f5 b/third_party/f5
index b5f94d01..47db6c9c 160000
--- a/third_party/f5
+++ b/third_party/f5
@@ -1 +1 @@
-Subproject commit b5f94d01cc2b8c45323c83febcd8343c850ca046
+Subproject commit 47db6c9c60d59681e7fc02bd5649d7fe918b124e
diff --git a/third_party/q5 b/third_party/q5
index fe65489d..37aba942 160000
--- a/third_party/q5
+++ b/third_party/q5
@@ -1 +1 @@
-Subproject commit fe65489de27eef96e2c1879cb19dd84ee172be9c
+Subproject commit 37aba942375f8f8bd62c162aab4e93ca0b86aa6b