Quent42340/OpenMiner
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ServerWorld] Tried to improve chunk sending.

Browse Source
This commit is contained in:
Quentin Bazin 2021-05-17 21:31:18 +02:00
parent 0144b928b3
commit 199be908ae
2 changed files with 74 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
source/server/world/ServerWorld.cpp
View File

@ -50,9 +50,20 @@ ServerWorld::ServerWorld(PlayerList &players, const Dimension &dimension, gk::Ga
void ServerWorld::update(bool doTick) { void ServerWorld::update(bool doTick) {
World::update(); World::update();
while (!m_chunksToSend.empty()) { // Debug variables
auto &[chunkPos, player] = m_chunksToSend.front(); u64 chunksGenerated = 0;
if (player.sentChunks.find(chunkPos) == player.sentChunks.end()) { u64 chunksSent = 0;
// u64 chunksBackToQueue = 0;
// u64 chunksTooOld = 0;
// u64 startQueueSize = m_chunkSendRequestQueue.size();
u64 start = gk::GameClock::getInstance().getTicks(true);
u64 now = start;
while (/* now - start < 100 && */!m_chunkSendRequestQueue.empty()) {
auto &[chunkPos, player, timestamp] = m_chunkSendRequestQueue.front();
// bool isTooOld = now - timestamp >= 1000;
if (/* !isTooOld && */player.sentChunks.find(chunkPos) == player.sentChunks.end()) {
glm::dvec3 chunkWorldPos{ glm::dvec3 chunkWorldPos{
chunkPos.x * CHUNK_WIDTH + CHUNK_WIDTH / 2.f, chunkPos.x * CHUNK_WIDTH + CHUNK_WIDTH / 2.f,
chunkPos.y * CHUNK_DEPTH + CHUNK_DEPTH / 2.f, chunkPos.y * CHUNK_DEPTH + CHUNK_DEPTH / 2.f,
@ -65,37 +76,73 @@ void ServerWorld::update(bool doTick) {
player.z() player.z()
}; };
// bool addChunkBackToQueue = false;
if (glm::length(playerPos - chunkWorldPos) < (ServerConfig::renderDistance + 1) * CHUNK_WIDTH) { if (glm::length(playerPos - chunkWorldPos) < (ServerConfig::renderDistance + 1) * CHUNK_WIDTH) {
if (player.isOnline() && !player.isChunkLoaded(chunkPos)) { if (player.isOnline() && !player.isChunkLoaded(chunkPos)) {
ServerChunk &chunk = getOrCreateChunk(chunkPos.x, chunkPos.y, chunkPos.z); ServerChunk &chunk = getOrCreateChunk(chunkPos.x, chunkPos.y, chunkPos.z);
if (!chunk.isInitialized()) {
++chunksGenerated;
// if (chunksSent == 0) {
// addChunkBackToQueue = true;
//
// ++chunksBackToQueue;
// }
}
generateChunk(chunk); generateChunk(chunk);
player.addLoadedChunk(chunkPos);
addChunkToUpdate(&chunk); if (chunk.areAllNeighboursInitialized()) {
chunk.lightmap().updateLights();
chunk.setReadyToSend();
addChunkToProcess(&chunk);
player.addLoadedChunk(chunkPos);
++chunksSent;
}
} }
// gkDebug() << "OK for chunk" << chunkPos.x << chunkPos.y << chunkPos.z << ":" << glm::length(playerPos - chunkWorldPos) << "<" << (int)ServerConfig::renderDistance * CHUNK_WIDTH; // gkDebug() << "OK for chunk" << chunkPos.x << chunkPos.y << chunkPos.z << ":" << glm::length(playerPos - chunkWorldPos) << "<" << (int)ServerConfig::renderDistance * CHUNK_WIDTH;
auto addChunkToSend = [this](gk::Vector3i pos, s8 dx, s8 dy, s8 dz, ServerPlayer &player) { auto addChunkToQueue = [this](gk::Vector3i pos, s8 dx, s8 dy, s8 dz, ServerPlayer &player) {
pos.x += dx; pos.y += dy; pos.z += dz; pos.x += dx; pos.y += dy; pos.z += dz;
m_chunksToSend.emplace(std::make_pair(pos, std::ref(player))); m_chunkSendRequestQueue.emplace(pos, player, gk::GameClock::getInstance().getTicks(true));
}; };
addChunkToSend(chunkPos, 1, 0, 0, player); addChunkToQueue(chunkPos, 1, 0, 0, player);
addChunkToSend(chunkPos, -1, 0, 0, player); addChunkToQueue(chunkPos, -1, 0, 0, player);
addChunkToSend(chunkPos, 0, 1, 0, player); addChunkToQueue(chunkPos, 0, 1, 0, player);
addChunkToSend(chunkPos, 0, -1, 0, player); addChunkToQueue(chunkPos, 0, -1, 0, player);
addChunkToSend(chunkPos, 0, 0, 1, player); addChunkToQueue(chunkPos, 0, 0, 1, player);
addChunkToSend(chunkPos, 0, 0, -1, player); addChunkToQueue(chunkPos, 0, 0, -1, player);
} }
player.sentChunks.emplace(chunkPos); // if (addChunkBackToQueue)
// m_chunkSendRequestQueue.emplace(chunkPos, player, timestamp);
// else
player.sentChunks.emplace(chunkPos);
} }
m_chunksToSend.pop(); // if (isTooOld)
// ++chunksTooOld;
m_chunkSendRequestQueue.pop();
now = gk::GameClock::getInstance().getTicks(true);
}
if (m_dimension.id() == 0 && now - start > 0) {
gkDebug() << "Took" << now - start << "ms"
<< "| Gen:" << chunksGenerated
<< "| Sent:" << chunksSent;
// << "| BTQ:" << chunksBackToQueue
// << "| Old:" << chunksTooOld
// << "| QLen:" << startQueueSize << "->" << m_chunkSendRequestQueue.size();
} }
if (doTick) { if (doTick) {
for (auto &it : m_chunks) for (auto &it : m_chunks) // TODO: Loop on a subset of this hashmap
it.second->tick(); it.second->tick();
m_scene.update(); m_scene.update();
@ -105,7 +152,7 @@ void ServerWorld::update(bool doTick) {
void ServerWorld::updatePlayerChunks(ServerPlayer &player, s32 cx, s32 cy, s32 cz) { void ServerWorld::updatePlayerChunks(ServerPlayer &player, s32 cx, s32 cy, s32 cz) {
gk::Vector3i currentChunk{cx, cy, cz}; gk::Vector3i currentChunk{cx, cy, cz};
player.sentChunks.clear(); player.sentChunks.clear();
m_chunksToSend.emplace(std::make_pair(currentChunk, std::ref(player))); m_chunkSendRequestQueue.emplace(currentChunk, player, gk::GameClock::getInstance().getTicks(true));
std::list<gk::Vector3i> chunksToRemove; std::list<gk::Vector3i> chunksToRemove;
for (auto &chunkPos : player.loadedChunks()) { for (auto &chunkPos : player.loadedChunks()) {

11
source/server/world/ServerWorld.hpp
View File

@ -95,7 +95,16 @@ class ServerWorld : public World {
s32 m_seed = 0; s32 m_seed = 0;
std::queue<std::pair<gk::Vector3i, ServerPlayer &>> m_chunksToSend; struct ChunkSendRequest {
ChunkSendRequest(const gk::Vector3i &chunkPos_, ServerPlayer &player_, u64 timestamp_)
: chunkPos(chunkPos_), player(player_), timestamp(timestamp_) {}
gk::Vector3i chunkPos;
ServerPlayer &player;
u64 timestamp;
};
std::queue<ChunkSendRequest> m_chunkSendRequestQueue;
}; };
#endif // SERVERWORLD_HPP_ #endif // SERVERWORLD_HPP_