minetest
/
minetest
mirror of https://github.com/minetest/minetest.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Server::AsyncRunStep + Server::sendAddNode: modernize code 

* Use various modern for loops
* Make some loop iterator constants, whereas there weren't
* Use empty on some size() > 0 tests
* Various little codestyle fixes
* Fix an hidden scope variable in Server::SendBlockNoLock
This commit is contained in:
Loic Blot 2017-08-14 00:44:45 +02:00
parent 725a0f56db
commit 5d06ecb366
No known key found for this signature in database
GPG Key ID: EFAA458E8C153987
1 changed files with 39 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
src/server.cpp
View File

@ -766,7 +766,7 @@ void Server::AsyncRunStep(bool initial_step)
if (aom.id == 0) if (aom.id == 0)
break; break;
std::vector<ActiveObjectMessage>* message_list = NULL; std::vector<ActiveObjectMessage>* message_list = nullptr;
std::unordered_map<u16, std::vector<ActiveObjectMessage>* >::iterator n; std::unordered_map<u16, std::vector<ActiveObjectMessage>* >::iterator n;
n = buffered_messages.find(aom.id); n = buffered_messages.find(aom.id);
if (n == buffered_messages.end()) { if (n == buffered_messages.end()) {
@ -780,29 +780,24 @@ void Server::AsyncRunStep(bool initial_step)
} }
m_clients.lock(); m_clients.lock();
RemoteClientMap clients = m_clients.getClientList(); const RemoteClientMap &clients = m_clients.getClientList();
// Route data to every client // Route data to every client
for (std::unordered_map<u16, RemoteClient*>::iterator i = clients.begin(); for (const auto &client_it : clients) {
i != clients.end(); ++i) { RemoteClient *client = client_it.second;
RemoteClient *client = i->second;
std::string reliable_data; std::string reliable_data;
std::string unreliable_data; std::string unreliable_data;
// Go through all objects in message buffer // Go through all objects in message buffer
for (std::unordered_map<u16, std::vector<ActiveObjectMessage>* >::iterator for (const auto &buffered_message : buffered_messages) {
j = buffered_messages.begin();
j != buffered_messages.end(); ++j) {
// If object is not known by client, skip it // If object is not known by client, skip it
u16 id = j->first; u16 id = buffered_message.first;
if (client->m_known_objects.find(id) == client->m_known_objects.end()) if (client->m_known_objects.find(id) == client->m_known_objects.end())
continue; continue;
// Get message list of object // Get message list of object
std::vector<ActiveObjectMessage>* list = j->second; std::vector<ActiveObjectMessage>* list = buffered_message.second;
// Go through every message // Go through every message
for (std::vector<ActiveObjectMessage>::iterator for (const ActiveObjectMessage &aom : *list) {
k = list->begin(); k != list->end(); ++k) {
// Compose the full new data with header // Compose the full new data with header
ActiveObjectMessage aom = *k;
std::string new_data; std::string new_data;
// Add object id // Add object id
char buf[2]; char buf[2];
@ -811,7 +806,7 @@ void Server::AsyncRunStep(bool initial_step)
// Add data // Add data
new_data += serializeString(aom.datastring); new_data += serializeString(aom.datastring);
// Add data to buffer // Add data to buffer
if(aom.reliable) if (aom.reliable)
reliable_data += new_data; reliable_data += new_data;
else else
unreliable_data += new_data; unreliable_data += new_data;
@ -821,21 +816,19 @@ void Server::AsyncRunStep(bool initial_step)
reliable_data and unreliable_data are now ready. reliable_data and unreliable_data are now ready.
Send them. Send them.
*/ */
if(reliable_data.size() > 0) { if (!reliable_data.empty()) {
SendActiveObjectMessages(client->peer_id, reliable_data); SendActiveObjectMessages(client->peer_id, reliable_data);
} }
if(unreliable_data.size() > 0) { if (!unreliable_data.empty()) {
SendActiveObjectMessages(client->peer_id, unreliable_data, false); SendActiveObjectMessages(client->peer_id, unreliable_data, false);
} }
} }
m_clients.unlock(); m_clients.unlock();
// Clear buffered_messages // Clear buffered_messages
for (std::unordered_map<u16, std::vector<ActiveObjectMessage>* >::iterator for (auto &buffered_message : buffered_messages) {
i = buffered_messages.begin(); delete buffered_message.second;
i != buffered_messages.end(); ++i) {
delete i->second;
} }
} }
@ -859,8 +852,7 @@ void Server::AsyncRunStep(bool initial_step)
// We'll log the amount of each // We'll log the amount of each
Profiler prof; Profiler prof;
while(m_unsent_map_edit_queue.size() != 0) while (!m_unsent_map_edit_queue.empty()) {
{
MapEditEvent* event = m_unsent_map_edit_queue.front(); MapEditEvent* event = m_unsent_map_edit_queue.front();
m_unsent_map_edit_queue.pop(); m_unsent_map_edit_queue.pop();
@ -890,10 +882,8 @@ void Server::AsyncRunStep(bool initial_step)
case MEET_OTHER: case MEET_OTHER:
infostream << "Server: MEET_OTHER" << std::endl; infostream << "Server: MEET_OTHER" << std::endl;
prof.add("MEET_OTHER", 1); prof.add("MEET_OTHER", 1);
for(std::set<v3s16>::iterator for (const v3s16 &modified_block : event->modified_blocks) {
i = event->modified_blocks.begin(); setBlockNotSent(modified_block);
i != event->modified_blocks.end(); ++i) {
setBlockNotSent(*i);
} }
break; break;
default: default:
@ -906,38 +896,29 @@ void Server::AsyncRunStep(bool initial_step)
/* /*
Set blocks not sent to far players Set blocks not sent to far players
*/ */
if(!far_players.empty()) { if (!far_players.empty()) {
// Convert list format to that wanted by SetBlocksNotSent // Convert list format to that wanted by SetBlocksNotSent
std::map<v3s16, MapBlock*> modified_blocks2; std::map<v3s16, MapBlock*> modified_blocks2;
for(std::set<v3s16>::iterator for (const v3s16 &modified_block : event->modified_blocks) {
i = event->modified_blocks.begin(); modified_blocks2[modified_block] =
i != event->modified_blocks.end(); ++i) { m_env->getMap().getBlockNoCreateNoEx(modified_block);
modified_blocks2[*i] =
m_env->getMap().getBlockNoCreateNoEx(*i);
} }
// Set blocks not sent // Set blocks not sent
for(std::vector<u16>::iterator for (const u16 far_player : far_players) {
i = far_players.begin(); if (RemoteClient *client = getClient(far_player))
i != far_players.end(); ++i) {
if(RemoteClient *client = getClient(*i))
client->SetBlocksNotSent(modified_blocks2); client->SetBlocksNotSent(modified_blocks2);
} }
} }
delete event; delete event;
/*// Don't send too many at a time
count++;
if(count >= 1 && m_unsent_map_edit_queue.size() < 100)
break;*/
} }
if(event_count >= 5){ if (event_count >= 5) {
infostream<<"Server: MapEditEvents:"<<std::endl; infostream << "Server: MapEditEvents:" << std::endl;
prof.print(infostream); prof.print(infostream);
} else if(event_count != 0){ } else if (event_count != 0) {
verbosestream<<"Server: MapEditEvents:"<<std::endl; verbosestream << "Server: MapEditEvents:" << std::endl;
prof.print(verbosestream); prof.print(verbosestream);
} }
@ -1290,8 +1271,7 @@ void Server::setInventoryModified(const InventoryLocation &loc, bool playerSend)
if (!playerSend) if (!playerSend)
return; return;
RemotePlayer *player = RemotePlayer *player = m_env->getPlayer(loc.name.c_str());
dynamic_cast<RemotePlayer *>(m_env->getPlayer(loc.name.c_str()));
if (!player) if (!player)
return; return;
@ -2212,10 +2192,10 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
v3f p_f = intToFloat(p, BS); v3f p_f = intToFloat(p, BS);
std::vector<u16> clients = m_clients.getClientIDs(); std::vector<u16> clients = m_clients.getClientIDs();
for(std::vector<u16>::iterator i = clients.begin(); i != clients.end(); ++i) { for (const u16 client_id : clients) {
if (far_players) { if (far_players) {
// Get player // Get player
if (RemotePlayer *player = m_env->getPlayer(*i)) { if (RemotePlayer *player = m_env->getPlayer(client_id)) {
PlayerSAO *sao = player->getPlayerSAO(); PlayerSAO *sao = player->getPlayerSAO();
if (!sao) if (!sao)
continue; continue;
@ -2223,7 +2203,7 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
// If player is far away, only set modified blocks not sent // If player is far away, only set modified blocks not sent
v3f player_pos = sao->getBasePosition(); v3f player_pos = sao->getBasePosition();
if(player_pos.getDistanceFrom(p_f) > maxd) { if(player_pos.getDistanceFrom(p_f) > maxd) {
far_players->push_back(*i); far_players->push_back(client_id);
continue; continue;
} }
} }
@ -2231,8 +2211,8 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
NetworkPacket pkt(TOCLIENT_ADDNODE, 6 + 2 + 1 + 1 + 1); NetworkPacket pkt(TOCLIENT_ADDNODE, 6 + 2 + 1 + 1 + 1);
m_clients.lock(); m_clients.lock();
RemoteClient* client = m_clients.lockedGetClientNoEx(*i); RemoteClient* client = m_clients.lockedGetClientNoEx(client_id);
if (client != 0) { if (client) {
pkt << p << n.param0 << n.param1 << n.param2 pkt << p << n.param0 << n.param1 << n.param2
<< (u8) (remove_metadata ? 0 : 1); << (u8) (remove_metadata ? 0 : 1);
} }
@ -2240,7 +2220,7 @@ void Server::sendAddNode(v3s16 p, MapNode n, u16 ignore_id,
// Send as reliable // Send as reliable
if (pkt.getSize() > 0) if (pkt.getSize() > 0)
m_clients.send(*i, 0, &pkt, true); m_clients.send(client_id, 0, &pkt, true);
} }
} }
@ -2248,9 +2228,8 @@ void Server::setBlockNotSent(v3s16 p)
{ {
std::vector<u16> clients = m_clients.getClientIDs(); std::vector<u16> clients = m_clients.getClientIDs();
m_clients.lock(); m_clients.lock();
for(std::vector<u16>::iterator i = clients.begin(); for (const u16 i : clients) {
i != clients.end(); ++i) { RemoteClient *client = m_clients.lockedGetClientNoEx(i);
RemoteClient *client = m_clients.lockedGetClientNoEx(*i);
client->SetBlockNotSent(p); client->SetBlockNotSent(p);
} }
m_clients.unlock(); m_clients.unlock();
@ -2292,16 +2271,15 @@ void Server::SendBlocks(float dtime)
s32 total_sending = 0; s32 total_sending = 0;
{ {
ScopeProfiler sp(g_profiler, "Server: selecting blocks for sending"); ScopeProfiler sp2(g_profiler, "Server: selecting blocks for sending");
std::vector<u16> clients = m_clients.getClientIDs(); std::vector<u16> clients = m_clients.getClientIDs();
m_clients.lock(); m_clients.lock();
for(std::vector<u16>::iterator i = clients.begin(); for (const u16 client_id : clients) {
i != clients.end(); ++i) { RemoteClient *client = m_clients.lockedGetClientNoEx(client_id, CS_Active);
RemoteClient *client = m_clients.lockedGetClientNoEx(*i, CS_Active);
if (client == NULL) if (!client)
continue; continue;
total_sending += client->SendingCount(); total_sending += client->SendingCount();