BRNSystems/minetest
1
0
Fork 0
forked from Mirrorlandia_minetest/minetest
Code Pull Requests 1 Activity

ClientInterface: Use recursive mutex to prevent freeze in on_newplayer() (#8808)

Browse Source
This commit is contained in:
SmallJoker 2019-08-17 13:27:28 +02:00 committed by GitHub
parent 13b22e2afb
commit d73e458db6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/clientiface.cpp
View File

@ -636,7 +636,7 @@ ClientInterface::~ClientInterface()
Delete clients Delete clients
*/ */
{ {
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (auto &client_it : m_clients) { for (auto &client_it : m_clients) {
// Delete client // Delete client
@ -648,7 +648,7 @@ ClientInterface::~ClientInterface()
std::vector<session_t> ClientInterface::getClientIDs(ClientState min_state) std::vector<session_t> ClientInterface::getClientIDs(ClientState min_state)
{ {
std::vector<session_t> reply; std::vector<session_t> reply;
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (const auto &m_client : m_clients) { for (const auto &m_client : m_clients) {
if (m_client.second->getState() >= min_state) if (m_client.second->getState() >= min_state)
@ -660,7 +660,7 @@ std::vector<session_t> ClientInterface::getClientIDs(ClientState min_state)
void ClientInterface::markBlockposAsNotSent(const v3s16 &pos) void ClientInterface::markBlockposAsNotSent(const v3s16 &pos)
{ {
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (const auto &client : m_clients) { for (const auto &client : m_clients) {
if (client.second->getState() >= CS_Active) if (client.second->getState() >= CS_Active)
client.second->SetBlockNotSent(pos); client.second->SetBlockNotSent(pos);
@ -705,7 +705,7 @@ void ClientInterface::UpdatePlayerList()
infostream << "* " << player->getName() << "\t"; infostream << "* " << player->getName() << "\t";
{ {
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
RemoteClient* client = lockedGetClientNoEx(i); RemoteClient* client = lockedGetClientNoEx(i);
if (client) if (client)
client->PrintInfo(infostream); client->PrintInfo(infostream);
@ -724,7 +724,7 @@ void ClientInterface::send(session_t peer_id, u8 channelnum,
void ClientInterface::sendToAll(NetworkPacket *pkt) void ClientInterface::sendToAll(NetworkPacket *pkt)
{ {
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (auto &client_it : m_clients) { for (auto &client_it : m_clients) {
RemoteClient *client = client_it.second; RemoteClient *client = client_it.second;
@ -739,7 +739,7 @@ void ClientInterface::sendToAll(NetworkPacket *pkt)
void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacypkt, void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacypkt,
u16 min_proto_ver) u16 min_proto_ver)
{ {
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (auto &client_it : m_clients) { for (auto &client_it : m_clients) {
RemoteClient *client = client_it.second; RemoteClient *client = client_it.second;
NetworkPacket *pkt_to_send = nullptr; NetworkPacket *pkt_to_send = nullptr;
@ -763,7 +763,7 @@ void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacyp
RemoteClient* ClientInterface::getClientNoEx(session_t peer_id, ClientState state_min) RemoteClient* ClientInterface::getClientNoEx(session_t peer_id, ClientState state_min)
{ {
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
RemoteClientMap::const_iterator n = m_clients.find(peer_id); RemoteClientMap::const_iterator n = m_clients.find(peer_id);
// The client may not exist; clients are immediately removed if their // The client may not exist; clients are immediately removed if their
// access is denied, and this event occurs later then. // access is denied, and this event occurs later then.
@ -792,7 +792,7 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(session_t peer_id, ClientStat
ClientState ClientInterface::getClientState(session_t peer_id) ClientState ClientInterface::getClientState(session_t peer_id)
{ {
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
RemoteClientMap::const_iterator n = m_clients.find(peer_id); RemoteClientMap::const_iterator n = m_clients.find(peer_id);
// The client may not exist; clients are immediately removed if their // The client may not exist; clients are immediately removed if their
// access is denied, and this event occurs later then. // access is denied, and this event occurs later then.
@ -804,7 +804,7 @@ ClientState ClientInterface::getClientState(session_t peer_id)
void ClientInterface::setPlayerName(session_t peer_id, const std::string &name) void ClientInterface::setPlayerName(session_t peer_id, const std::string &name)
{ {
MutexAutoLock clientslock(m_clients_mutex); RecursiveMutexAutoLock clientslock(m_clients_mutex);
RemoteClientMap::iterator n = m_clients.find(peer_id); RemoteClientMap::iterator n = m_clients.find(peer_id);
// The client may not exist; clients are immediately removed if their // The client may not exist; clients are immediately removed if their
// access is denied, and this event occurs later then. // access is denied, and this event occurs later then.
@ -814,7 +814,7 @@ void ClientInterface::setPlayerName(session_t peer_id, const std::string &name)
void ClientInterface::DeleteClient(session_t peer_id) void ClientInterface::DeleteClient(session_t peer_id)
{ {
MutexAutoLock conlock(m_clients_mutex); RecursiveMutexAutoLock conlock(m_clients_mutex);
// Error check // Error check
RemoteClientMap::iterator n = m_clients.find(peer_id); RemoteClientMap::iterator n = m_clients.find(peer_id);
@ -844,7 +844,7 @@ void ClientInterface::DeleteClient(session_t peer_id)
void ClientInterface::CreateClient(session_t peer_id) void ClientInterface::CreateClient(session_t peer_id)
{ {
MutexAutoLock conlock(m_clients_mutex); RecursiveMutexAutoLock conlock(m_clients_mutex);
// Error check // Error check
RemoteClientMap::iterator n = m_clients.find(peer_id); RemoteClientMap::iterator n = m_clients.find(peer_id);
@ -860,7 +860,7 @@ void ClientInterface::CreateClient(session_t peer_id)
void ClientInterface::event(session_t peer_id, ClientStateEvent event) void ClientInterface::event(session_t peer_id, ClientStateEvent event)
{ {
{ {
MutexAutoLock clientlock(m_clients_mutex); RecursiveMutexAutoLock clientlock(m_clients_mutex);
// Error check // Error check
RemoteClientMap::iterator n = m_clients.find(peer_id); RemoteClientMap::iterator n = m_clients.find(peer_id);
@ -881,7 +881,7 @@ void ClientInterface::event(session_t peer_id, ClientStateEvent event)
u16 ClientInterface::getProtocolVersion(session_t peer_id) u16 ClientInterface::getProtocolVersion(session_t peer_id)
{ {
MutexAutoLock conlock(m_clients_mutex); RecursiveMutexAutoLock conlock(m_clients_mutex);
// Error check // Error check
RemoteClientMap::iterator n = m_clients.find(peer_id); RemoteClientMap::iterator n = m_clients.find(peer_id);
@ -896,7 +896,7 @@ u16 ClientInterface::getProtocolVersion(session_t peer_id)
void ClientInterface::setClientVersion(session_t peer_id, u8 major, u8 minor, u8 patch, void ClientInterface::setClientVersion(session_t peer_id, u8 major, u8 minor, u8 patch,
const std::string &full) const std::string &full)
{ {
MutexAutoLock conlock(m_clients_mutex); RecursiveMutexAutoLock conlock(m_clients_mutex);
// Error check // Error check
RemoteClientMap::iterator n = m_clients.find(peer_id); RemoteClientMap::iterator n = m_clients.find(peer_id);

2
src/clientiface.h
View File

@ -501,7 +501,7 @@ private:
// Connection // Connection
std::shared_ptr<con::Connection> m_con; std::shared_ptr<con::Connection> m_con;
std::mutex m_clients_mutex; std::recursive_mutex m_clients_mutex;
// Connected clients (behind the con mutex) // Connected clients (behind the con mutex)
RemoteClientMap m_clients; RemoteClientMap m_clients;
std::vector<std::string> m_clients_names; //for announcing masterserver std::vector<std::string> m_clients_names; //for announcing masterserver