oss/luanti
oss/luanti
1
0
Fork 0
mirror of https://github.com/luanti-org/luanti.git synced 2025-10-05 19:31:04 +00:00
Code Wiki Activity

Minor cleanups and logging changes

Browse source
This commit is contained in:
sfan5 2025-07-14 22:42:59 +02:00
parent 77dd86a79c
commit 3cb8ce69d2
8 changed files with 37 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/server/clientiface.cpp
View file

@ -709,8 +709,8 @@ void ClientInterface::step(float dtime)
try {
Address addr = m_con->GetPeerAddress(it.second->peer_id);
os << "Disconnecting lingering client from "
<< addr.serializeString() << " (state="
<< state2Name(state) << ")" << std::endl;
<< addr.serializeString() << " peer_id=" << it.second->peer_id
<< " (" << state2Name(state) << ")" << std::endl;
m_con->DisconnectPeer(it.second->peer_id);
} catch (con::PeerNotFoundException &e) {
}
@ -739,6 +739,7 @@ void ClientInterface::UpdatePlayerList()
RemoteClient* client = lockedGetClientNoEx(i);
if (client)
client->PrintInfo(infostream);
infostream << std::endl;
}
m_clients_names.emplace_back(player->getName());

18
src/server/clientiface.h
View file

@ -276,12 +276,12 @@ public:
void PrintInfo(std::ostream &o)
{
o<<"RemoteClient "<<peer_id<<": "
<<"m_blocks_sent.size()="<<m_blocks_sent.size()
<<", m_blocks_sending.size()="<<m_blocks_sending.size()
<<", m_nearest_unsent_d="<<m_nearest_unsent_d
<<", m_excess_gotblocks="<<m_excess_gotblocks
<<std::endl;
o << "RemoteClient " << peer_id << ": "
<<"blocks_sent=" << m_blocks_sent.size()
<<", blocks_sending=" << m_blocks_sending.size()
<<", nearest_unsent_d=" << m_nearest_unsent_d
<<", map_send_completion_timer=" << (int)(m_map_send_completion_timer + 0.5f)
<<", excess_gotblocks=" << m_excess_gotblocks;
m_excess_gotblocks = 0;
}
@ -507,13 +507,17 @@ private:
// Connection
std::shared_ptr<con::IConnection> m_con;
// FIXME?: as far as I can tell this lock is pointless because only the server
// thread ever touches the clients. Consider how getClientNoEx() returns
// a raw pointer too.
std::recursive_mutex m_clients_mutex;
// Connected clients (behind the mutex)
RemoteClientMap m_clients;
std::vector<std::string> m_clients_names; // for announcing to server list
// Environment
ServerEnvironment *m_env;
ServerEnvironment *m_env = nullptr;
float m_print_info_timer = 0;
float m_check_linger_timer = 0;