summaryrefslogtreecommitdiffstats
path: root/src/ChunkSender.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/ChunkSender.cpp')
-rw-r--r--src/ChunkSender.cpp279
1 files changed, 115 insertions, 164 deletions
diff --git a/src/ChunkSender.cpp b/src/ChunkSender.cpp
index 83d82884e..de886b497 100644
--- a/src/ChunkSender.cpp
+++ b/src/ChunkSender.cpp
@@ -13,6 +13,7 @@
#include "BlockEntities/BlockEntity.h"
#include "Protocol/ChunkDataSerializer.h"
#include "ClientHandle.h"
+#include "Chunk.h"
@@ -21,25 +22,37 @@
////////////////////////////////////////////////////////////////////////////////
// cNotifyChunkSender:
-void cNotifyChunkSender::Call(int a_ChunkX, int a_ChunkZ)
-{
- m_ChunkSender->ChunkReady(a_ChunkX, a_ChunkZ);
-}
+/// Callback that can be used to notify chunk sender upon another chunkcoord notification
+class cNotifyChunkSender :
+ public cChunkCoordCallback
+{
+ virtual void Call(int a_ChunkX, int a_ChunkZ) override
+ {
+ cChunkSender & ChunkSender = m_ChunkSender;
+ m_World.DoWithChunk(
+ a_ChunkX, a_ChunkZ,
+ [&ChunkSender] (cChunk & a_Chunk) -> bool
+ {
+ ChunkSender.QueueSendChunkTo(a_Chunk.GetPosX(), a_Chunk.GetPosZ(), cChunkSender::E_CHUNK_PRIORITY_MIDHIGH, a_Chunk.GetAllClients());
+ return true;
+ }
+ );
+ }
+ cChunkSender & m_ChunkSender;
+ cWorld & m_World;
+public:
+ cNotifyChunkSender(cChunkSender & a_ChunkSender, cWorld & a_World) : m_ChunkSender(a_ChunkSender), m_World(a_World) {}
-////////////////////////////////////////////////////////////////////////////////
-// cChunkSender:
+};
-cChunkSender::cChunkSender(void) :
+cChunkSender::cChunkSender(cWorld & a_World) :
super("ChunkSender"),
- m_World(nullptr),
- m_RemoveCount(0),
- m_Notify(nullptr)
+ m_World(a_World)
{
- m_Notify.SetChunkSender(this);
}
@@ -55,10 +68,9 @@ cChunkSender::~cChunkSender()
-bool cChunkSender::Start(cWorld * a_World)
+bool cChunkSender::Start()
{
m_ShouldTerminate = false;
- m_World = a_World;
return super::Start();
}
@@ -77,12 +89,30 @@ void cChunkSender::Stop(void)
-void cChunkSender::ChunkReady(int a_ChunkX, int a_ChunkZ)
+void cChunkSender::QueueSendChunkTo(int a_ChunkX, int a_ChunkZ, eChunkPriority a_Priority, cClientHandle * a_Client)
{
- // This is probably never gonna be called twice for the same chunk, and if it is, we don't mind, so we don't check
+ ASSERT(a_Client != nullptr);
{
+ cChunkCoords Chunk{a_ChunkX, a_ChunkZ};
cCSLock Lock(m_CS);
- m_ChunksReady.push_back(cChunkCoords(a_ChunkX, a_ChunkZ));
+ auto iter = m_ChunkInfo.find(Chunk);
+ if (iter != m_ChunkInfo.end())
+ {
+ auto & info = iter->second;
+ if (info.m_Priority > a_Priority)
+ {
+ m_SendChunks.push(sChunkQueue{a_Priority, Chunk});
+ info.m_Priority = a_Priority;
+ }
+ info.m_Clients.insert(a_Client);
+ }
+ else
+ {
+ m_SendChunks.push(sChunkQueue{a_Priority, Chunk});
+ auto info = sSendChunk{Chunk, a_Priority};
+ info.m_Clients.insert(a_Client);
+ m_ChunkInfo.emplace(Chunk, info);
+ }
}
m_evtQueue.Set();
}
@@ -91,44 +121,29 @@ void cChunkSender::ChunkReady(int a_ChunkX, int a_ChunkZ)
-void cChunkSender::QueueSendChunkTo(int a_ChunkX, int a_ChunkZ, eChunkPriority a_Priority, cClientHandle * a_Client)
+
+void cChunkSender::QueueSendChunkTo(int a_ChunkX, int a_ChunkZ, eChunkPriority a_Priority, std::list<cClientHandle *> a_Clients)
{
- ASSERT(a_Client != nullptr);
{
- sSendChunk Chunk(a_ChunkX, a_ChunkZ, a_Client);
-
+ cChunkCoords Chunk{a_ChunkX, a_ChunkZ};
cCSLock Lock(m_CS);
- if (
- std::find(m_SendChunksLowPriority.begin(), m_SendChunksLowPriority.end(), Chunk) != m_SendChunksLowPriority.end() ||
- std::find(m_SendChunksMediumPriority.begin(), m_SendChunksMediumPriority.end(), Chunk) != m_SendChunksMediumPriority.end() ||
- std::find(m_SendChunksHighPriority.begin(), m_SendChunksHighPriority.end(), Chunk) != m_SendChunksHighPriority.end()
- )
- {
- // Already queued, bail out
- return;
- }
-
- switch (a_Priority)
+ auto iter = m_ChunkInfo.find(Chunk);
+ if (iter != m_ChunkInfo.end())
{
- case E_CHUNK_PRIORITY_LOW:
+ auto & info = iter->second;
+ if (info.m_Priority > a_Priority)
{
- m_SendChunksLowPriority.push_back(Chunk);
- break;
- }
- case E_CHUNK_PRIORITY_MEDIUM:
- {
- m_SendChunksMediumPriority.push_back(Chunk);
- break;
- }
- case E_CHUNK_PRIORITY_HIGH:
- {
- m_SendChunksHighPriority.push_back(Chunk);
- break;
- }
- default:
- {
- ASSERT(!"Unknown chunk priority!");
+ m_SendChunks.push(sChunkQueue{a_Priority, Chunk});
+ info.m_Priority = a_Priority;
}
+ info.m_Clients.insert(a_Clients.begin(), a_Clients.end());
+ }
+ else
+ {
+ m_SendChunks.push(sChunkQueue{a_Priority, Chunk});
+ auto info = sSendChunk{Chunk, a_Priority};
+ info.m_Clients.insert(a_Clients.begin(), a_Clients.end());
+ m_ChunkInfo.emplace(Chunk, info);
}
}
m_evtQueue.Set();
@@ -142,37 +157,14 @@ void cChunkSender::RemoveClient(cClientHandle * a_Client)
{
{
cCSLock Lock(m_CS);
- for (sSendChunkList::iterator itr = m_SendChunksLowPriority.begin(); itr != m_SendChunksLowPriority.end();)
+ for (auto && pair : m_ChunkInfo)
{
- if (itr->m_Client == a_Client)
- {
- itr = m_SendChunksLowPriority.erase(itr);
- continue;
- }
- ++itr;
- } // for itr - m_SendChunksLowPriority[]
- for (sSendChunkList::iterator itr = m_SendChunksMediumPriority.begin(); itr != m_SendChunksMediumPriority.end();)
- {
- if (itr->m_Client == a_Client)
- {
- itr = m_SendChunksMediumPriority.erase(itr);
- continue;
- }
- ++itr;
- } // for itr - m_SendChunksMediumPriority[]
- for (sSendChunkList::iterator itr = m_SendChunksHighPriority.begin(); itr != m_SendChunksHighPriority.end();)
- {
- if (itr->m_Client == a_Client)
- {
- itr = m_SendChunksHighPriority.erase(itr);
- continue;
- }
- ++itr;
- } // for itr - m_SendChunksHighPriority[]
- m_RemoveCount++;
+ auto && clients = pair.second.m_Clients;
+ clients.erase(a_Client); // nop for sets that do not contain a_Client
+ }
}
m_evtQueue.Set();
- m_evtRemoved.Wait(); // Wait for removal confirmation
+ m_evtRemoved.Wait(); // Wait for all remaining instances of a_Client to be processed (Execute() makes a copy of m_ChunkInfo)
}
@@ -183,132 +175,91 @@ void cChunkSender::Execute(void)
{
while (!m_ShouldTerminate)
{
- cCSLock Lock(m_CS);
- while (m_ChunksReady.empty() && m_SendChunksLowPriority.empty() && m_SendChunksMediumPriority.empty() && m_SendChunksHighPriority.empty())
+ m_evtQueue.Wait();
+
{
- int RemoveCount = m_RemoveCount;
- m_RemoveCount = 0;
- cCSUnlock Unlock(Lock);
- for (int i = 0; i < RemoveCount; i++)
- {
- m_evtRemoved.Set(); // Notify that the removed clients are safe to be deleted
- }
- m_evtQueue.Wait();
- if (m_ShouldTerminate)
+ cCSLock Lock(m_CS);
+ while (!m_SendChunks.empty())
{
- return;
+ // Take one from the queue:
+ auto Chunk = m_SendChunks.top().m_Chunk;
+ m_SendChunks.pop();
+ auto itr = m_ChunkInfo.find(Chunk);
+ if (itr == m_ChunkInfo.end())
+ {
+ continue;
+ }
+
+ std::unordered_set<cClientHandle *> clients;
+ std::swap(itr->second.m_Clients, clients);
+ m_ChunkInfo.erase(itr);
+
+ cCSUnlock Unlock(Lock);
+ SendChunk(Chunk.m_ChunkX, Chunk.m_ChunkZ, clients);
}
- } // while (empty)
-
- if (!m_SendChunksHighPriority.empty())
- {
- // Take one from the queue:
- sSendChunk Chunk(m_SendChunksHighPriority.front());
- m_SendChunksHighPriority.pop_front();
- Lock.Unlock();
-
- SendChunk(Chunk.m_ChunkX, Chunk.m_ChunkZ, Chunk.m_Client);
- }
- else if (!m_ChunksReady.empty())
- {
- // Take one from the queue:
- cChunkCoords Coords(m_ChunksReady.front());
- m_ChunksReady.pop_front();
- Lock.Unlock();
-
- SendChunk(Coords.m_ChunkX, Coords.m_ChunkZ, nullptr);
}
- else if (!m_SendChunksMediumPriority.empty())
- {
- // Take one from the queue:
- sSendChunk Chunk(m_SendChunksMediumPriority.front());
- m_SendChunksMediumPriority.pop_front();
- Lock.Unlock();
- SendChunk(Chunk.m_ChunkX, Chunk.m_ChunkZ, Chunk.m_Client);
- }
- else
- {
- // Take one from the queue:
- sSendChunk Chunk(m_SendChunksLowPriority.front());
- m_SendChunksLowPriority.pop_front();
- Lock.Unlock();
-
- SendChunk(Chunk.m_ChunkX, Chunk.m_ChunkZ, Chunk.m_Client);
- }
- Lock.Lock();
- int RemoveCount = m_RemoveCount;
- m_RemoveCount = 0;
- Lock.Unlock();
- for (int i = 0; i < RemoveCount; i++)
- {
- m_evtRemoved.Set(); // Notify that the removed clients are safe to be deleted
- }
- } // while (!mShouldTerminate)
+ m_evtRemoved.SetAll(); // Notify all waiting threads that all clients are processed and thus safe to destroy
+ } // while (!m_ShouldTerminate)
}
-void cChunkSender::SendChunk(int a_ChunkX, int a_ChunkZ, cClientHandle * a_Client)
+void cChunkSender::SendChunk(int a_ChunkX, int a_ChunkZ, std::unordered_set<cClientHandle *> a_Clients)
{
- ASSERT(m_World != nullptr);
-
// Ask the client if it still wants the chunk:
- if ((a_Client != nullptr) && !a_Client->WantsSendChunk(a_ChunkX, a_ChunkZ))
+ for (auto itr = a_Clients.begin(); itr != a_Clients.end();)
{
- return;
+ if (!(*itr)->WantsSendChunk(a_ChunkX, a_ChunkZ))
+ {
+ itr = a_Clients.erase(itr);
+ }
+ else
+ {
+ itr++;
+ }
}
// If the chunk has no clients, no need to packetize it:
- if (!m_World->HasChunkAnyClients(a_ChunkX, a_ChunkZ))
+ if (!m_World.HasChunkAnyClients(a_ChunkX, a_ChunkZ))
{
return;
}
// If the chunk is not valid, do nothing - whoever needs it has queued it for loading / generating
- if (!m_World->IsChunkValid(a_ChunkX, a_ChunkZ))
+ if (!m_World.IsChunkValid(a_ChunkX, a_ChunkZ))
{
return;
}
// If the chunk is not lighted, queue it for relighting and get notified when it's ready:
- if (!m_World->IsChunkLighted(a_ChunkX, a_ChunkZ))
+ if (!m_World.IsChunkLighted(a_ChunkX, a_ChunkZ))
{
- m_World->QueueLightChunk(a_ChunkX, a_ChunkZ, &m_Notify);
+ m_World.QueueLightChunk(a_ChunkX, a_ChunkZ, cpp14::make_unique<cNotifyChunkSender>(*this, m_World));
return;
}
// Query and prepare chunk data:
- if (!m_World->GetChunkData(a_ChunkX, a_ChunkZ, *this))
+ if (!m_World.GetChunkData(a_ChunkX, a_ChunkZ, *this))
{
return;
}
cChunkDataSerializer Data(m_BlockTypes, m_BlockMetas, m_BlockLight, m_BlockSkyLight, m_BiomeMap);
- // Send:
- if (a_Client == nullptr)
- {
- m_World->BroadcastChunkData(a_ChunkX, a_ChunkZ, Data);
- }
- else
+ for (const auto client : a_Clients)
{
- a_Client->SendChunkData(a_ChunkX, a_ChunkZ, Data);
- }
+ // Send:
+ client->SendChunkData(a_ChunkX, a_ChunkZ, Data);
- // Send block-entity packets:
- for (sBlockCoords::iterator itr = m_BlockEntities.begin(); itr != m_BlockEntities.end(); ++itr)
- {
- if (a_Client == nullptr)
+ // Send block-entity packets:
+ for (const auto & Pos : m_BlockEntities)
{
- m_World->BroadcastBlockEntity(itr->m_BlockX, itr->m_BlockY, itr->m_BlockZ);
- }
- else
- {
- m_World->SendBlockEntity(itr->m_BlockX, itr->m_BlockY, itr->m_BlockZ, *a_Client);
- }
- } // for itr - m_Packets[]
+ m_World.SendBlockEntity(Pos.x, Pos.y, Pos.z, *client);
+ } // for itr - m_Packets[]
+
+ }
m_BlockEntities.clear();
// TODO: Send entity spawn packets
@@ -320,7 +271,7 @@ void cChunkSender::SendChunk(int a_ChunkX, int a_ChunkZ, cClientHandle * a_Clien
void cChunkSender::BlockEntity(cBlockEntity * a_Entity)
{
- m_BlockEntities.push_back(sBlockCoord(a_Entity->GetPosX(), a_Entity->GetPosY(), a_Entity->GetPosZ()));
+ m_BlockEntities.push_back(a_Entity->GetPos());
}
@@ -342,7 +293,7 @@ void cChunkSender::BiomeData(const cChunkDef::BiomeMap * a_BiomeMap)
if ((*a_BiomeMap)[i] < 255)
{
// Normal MC biome, copy as-is:
- m_BiomeMap[i] = (unsigned char)((*a_BiomeMap)[i]);
+ m_BiomeMap[i] = static_cast<unsigned char>((*a_BiomeMap)[i]);
}
else
{