diff options
| author | sfan5 <sfan5@live.de> | 2019-08-07 10:31:12 +0200 |
|---|---|---|
| committer | sfan5 <sfan5@live.de> | 2019-08-07 11:32:16 +0200 |
| commit | 19426387d4b1bb3b96094cdab97452c2e248f47d (patch) | |
| tree | e696a23e98be0bbd2c3b16966e02c8e87e3c8b0c /src/client | |
| parent | 4d7f2967172c5a358811ac1f24115b281eff2431 (diff) | |
| download | minetest-19426387d4b1bb3b96094cdab97452c2e248f47d.tar.gz minetest-19426387d4b1bb3b96094cdab97452c2e248f47d.tar.bz2 minetest-19426387d4b1bb3b96094cdab97452c2e248f47d.zip | |
Optimize usage of TOSERVER_GOTBLOCKS packet
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/client.cpp | 26 | ||||
| -rw-r--r-- | src/client/client.h | 2 |
2 files changed, 18 insertions, 10 deletions
diff --git a/src/client/client.cpp b/src/client/client.cpp index 78e077fc3..4dc05dc09 100644 --- a/src/client/client.cpp +++ b/src/client/client.cpp @@ -475,6 +475,7 @@ void Client::step(float dtime) */ { int num_processed_meshes = 0; + std::vector<v3s16> blocks_to_ack; while (!m_mesh_update_thread.m_queue_out.empty()) { num_processed_meshes++; @@ -513,14 +514,18 @@ void Client::step(float dtime) m_minimap->addBlock(r.p, minimap_mapblock); if (r.ack_block_to_server) { - /* - Acknowledge block - [0] u8 count - [1] v3s16 pos_0 - */ - sendGotBlocks(r.p); + if (blocks_to_ack.size() == 255) { + sendGotBlocks(blocks_to_ack); + blocks_to_ack.clear(); + } + + blocks_to_ack.emplace_back(r.p); } } + if (blocks_to_ack.size() > 0) { + // Acknowledge block(s) + sendGotBlocks(blocks_to_ack); + } if (num_processed_meshes > 0) g_profiler->graphAdd("num_processed_meshes", num_processed_meshes); @@ -1069,10 +1074,13 @@ void Client::sendDeletedBlocks(std::vector<v3s16> &blocks) Send(&pkt); } -void Client::sendGotBlocks(v3s16 block) +void Client::sendGotBlocks(const std::vector<v3s16> &blocks) { - NetworkPacket pkt(TOSERVER_GOTBLOCKS, 1 + 6); - pkt << (u8) 1 << block; + NetworkPacket pkt(TOSERVER_GOTBLOCKS, 1 + 6 * blocks.size()); + pkt << (u8) blocks.size(); + for (const v3s16 &block : blocks) + pkt << block; + Send(&pkt); } diff --git a/src/client/client.h b/src/client/client.h index 312b8c87f..527ae6524 100644 --- a/src/client/client.h +++ b/src/client/client.h @@ -465,7 +465,7 @@ private: void promptConfirmRegistration(AuthMechanism chosen_auth_mechanism); void startAuth(AuthMechanism chosen_auth_mechanism); void sendDeletedBlocks(std::vector<v3s16> &blocks); - void sendGotBlocks(v3s16 block); + void sendGotBlocks(const std::vector<v3s16> &blocks); void sendRemovedSounds(std::vector<s32> &soundList); // Helper function |