Mirror/Erupe
1
0
Fork 0
mirror of https://github.com/Mezeporta/Erupe.git synced 2026-03-22 15:43:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(stage): fix deadlock that was preventing stage change.

Browse Source
This commit is contained in:
Houmgaor
2025-10-27 01:11:57 +01:00
parent 7e9440d8cc
commit 488e8fa045
4 changed files with 69 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
server/channelserver/handlers_stage.go
View File

@@ -97,7 +97,8 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
s.stage = s.server.stages[stageID]
s.Unlock()
// Tell the client to cleanup its current stage objects
// Tell the client to cleanup its current stage objects.
// Use blocking send to ensure this critical cleanup packet is not dropped.
s.QueueSendMHF(&mhfpacket.MsgSysCleanupObject{})
// Confirm the stage entry
@@ -151,10 +152,12 @@ func doStageTransfer(s *Session, ackHandle uint32, stageID string) {
s.stage.RUnlock()
}
// FIX: Always send stage transfer packet, even if empty.
// The client expects this packet to complete the zone change, regardless of content.
// Previously, if newNotif was empty (no users, no objects), no packet was sent,
// causing the client to timeout after 60 seconds.
newNotif.WriteUint16(0x0010) // End it.
if len(newNotif.Data()) > 2 {
s.QueueSend(newNotif.Data())
}
s.QueueSend(newNotif.Data())
}
func destructEmptyStages(s *Session) {
@@ -172,17 +175,36 @@ func destructEmptyStages(s *Session) {
}
func removeSessionFromStage(s *Session) {
// Acquire stage lock to protect concurrent access to clients and objects maps
// This prevents race conditions when multiple goroutines access these maps
s.stage.Lock()
// Remove client from old stage.
delete(s.stage.clients, s)
// Delete old stage objects owned by the client.
// Collect objects to delete while holding lock
s.logger.Info("Sending notification to old stage clients")
var objectsToDelete []*Object
for _, object := range s.stage.objects {
if object.ownerCharID == s.charID {
s.stage.BroadcastMHF(&mhfpacket.MsgSysDeleteObject{ObjID: object.id}, s)
delete(s.stage.objects, object.ownerCharID)
objectsToDelete = append(objectsToDelete, object)
}
}
// Delete from map while still holding lock
for _, object := range objectsToDelete {
delete(s.stage.objects, object.ownerCharID)
}
// CRITICAL FIX: Unlock BEFORE broadcasting to avoid deadlock
// BroadcastMHF also tries to lock the stage, so we must release our lock first
s.stage.Unlock()
// Now broadcast the deletions (without holding the lock)
for _, object := range objectsToDelete {
s.stage.BroadcastMHF(&mhfpacket.MsgSysDeleteObject{ObjID: object.id}, s)
}
destructEmptyStages(s)
destructEmptySemaphores(s)
}

20
server/channelserver/sys_session.go
View File

@@ -147,7 +147,10 @@ func (s *Session) Start() {
//
// Thread Safety: Safe for concurrent calls from multiple goroutines.
func (s *Session) QueueSend(data []byte) {
s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
// FIX: Check data length before reading opcode to prevent crash on empty packets
if len(data) >= 2 {
s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
}
select {
case s.sendPackets <- packet{data, false}:
// Enqueued data
@@ -182,7 +185,9 @@ func (s *Session) QueueSend(data []byte) {
func (s *Session) QueueSendNonBlocking(data []byte) {
select {
case s.sendPackets <- packet{data, true}:
s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
if len(data) >= 2 {
s.logMessage(binary.BigEndian.Uint16(data[0:2]), data, "Server", s.Name)
}
default:
s.logger.Warn("Packet queue too full, dropping!")
}
@@ -231,10 +236,13 @@ func (s *Session) sendLoop() {
if s.closed {
return
}
pkt := <-s.sendPackets
err := s.cryptConn.SendPacket(append(pkt.data, []byte{0x00, 0x10}...))
if err != nil {
s.logger.Warn("Failed to send packet")
// Send each packet individually with its own terminator
for len(s.sendPackets) > 0 {
pkt := <-s.sendPackets
err := s.cryptConn.SendPacket(append(pkt.data, []byte{0x00, 0x10}...))
if err != nil {
s.logger.Warn("Failed to send packet", zap.Error(err))
}
}
time.Sleep(10 * time.Millisecond)
}