flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed one possibility of a deadlock in cClientHandle::SendChunkData()

Browse Source 
git-svn-id: http://mc-server.googlecode.com/svn/trunk@809 0a769ca7-a7f5-676a-18bf-c427514a06d6
This commit is contained in:
madmaxoft@gmail.com 2012-08-31 11:40:54 +00:00
parent 539364846a
commit f8b2cd99a6
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
source/cClientHandle.cpp
View File

@ -90,6 +90,7 @@ cClientHandle::cClientHandle(const cSocket & a_Socket, int a_ViewDistance)
, m_TimeLastPacket(cWorld::GetTime()) , m_TimeLastPacket(cWorld::GetTime())
, m_bKeepThreadGoing(true) , m_bKeepThreadGoing(true)
, m_Ping(1000) , m_Ping(1000)
, m_PingID(1)
, m_State(csConnected) , m_State(csConnected)
, m_LastStreamedChunkX(0x7fffffff) // bogus chunk coords to force streaming upon login , m_LastStreamedChunkX(0x7fffffff) // bogus chunk coords to force streaming upon login
, m_LastStreamedChunkZ(0x7fffffff) , m_LastStreamedChunkZ(0x7fffffff)
@ -1350,21 +1351,23 @@ void cClientHandle::SendChunkData(int a_ChunkX, int a_ChunkZ, cChunkDataSerializ
{ {
// Check chunks being sent, erase them from m_ChunksToSend: // Check chunks being sent, erase them from m_ChunksToSend:
bool Found = false; bool Found = false;
cCSLock Lock(m_CSChunkLists);
for (cChunkCoordsList::iterator itr = m_ChunksToSend.begin(); itr != m_ChunksToSend.end(); ++itr)
{ {
if ((itr->m_ChunkX == a_ChunkX) && (itr->m_ChunkZ == a_ChunkZ)) cCSLock Lock(m_CSChunkLists);
for (cChunkCoordsList::iterator itr = m_ChunksToSend.begin(); itr != m_ChunksToSend.end(); ++itr)
{ {
m_ChunksToSend.erase(itr); if ((itr->m_ChunkX == a_ChunkX) && (itr->m_ChunkZ == a_ChunkZ))
{
m_ChunksToSend.erase(itr);
// TODO: _X: Decouple this from packet sending, it creates a deadlock possibility // TODO: _X: Decouple this from packet sending, it creates a deadlock possibility
// -- postpone till Tick() instead, using a bool flag // -- postpone till Tick() instead, using a bool flag
CheckIfWorldDownloaded(); CheckIfWorldDownloaded();
Found = true; Found = true;
break; break;
} }
} // for itr - m_ChunksToSend[] } // for itr - m_ChunksToSend[]
}
if (!Found) if (!Found)
{ {
// This just sometimes happens. If you have a reliably replicatable situation for this, go ahead and fix it // This just sometimes happens. If you have a reliably replicatable situation for this, go ahead and fix it