Skip to content

Commit

Permalink
ClientInterface: Use recursive mutex to prevent freeze in on_newplaye…
Browse files Browse the repository at this point in the history 
…r() (#8808)
  • Loading branch information
@SmallJoker
SmallJoker committed Aug 17, 2019
1 parent 13b22e2 commit d73e458
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 15 deletions.
28 changes: 14 additions & 14 deletions src/clientiface.cpp
View file
Expand Up @@ -636,7 +636,7 @@ ClientInterface::~ClientInterface()
Delete clients
*/
{
MutexAutoLock clientslock(m_clients_mutex);
RecursiveMutexAutoLock clientslock(m_clients_mutex);

for (auto &client_it : m_clients) {
// Delete client
Expand All @@ -648,7 +648,7 @@ ClientInterface::~ClientInterface()
std::vector<session_t> ClientInterface::getClientIDs(ClientState min_state)
{
std::vector<session_t> reply;
MutexAutoLock clientslock(m_clients_mutex);
RecursiveMutexAutoLock clientslock(m_clients_mutex);

for (const auto &m_client : m_clients) {
if (m_client.second->getState() >= min_state)
Expand All @@ -660,7 +660,7 @@ std::vector<session_t> ClientInterface::getClientIDs(ClientState min_state)

void ClientInterface::markBlockposAsNotSent(const v3s16 &pos)
{
MutexAutoLock clientslock(m_clients_mutex);
RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (const auto &client : m_clients) {
if (client.second->getState() >= CS_Active)
client.second->SetBlockNotSent(pos);
Expand Down Expand Up @@ -705,7 +705,7 @@ void ClientInterface::UpdatePlayerList()
infostream << "* " << player->getName() << "\t";

{
MutexAutoLock clientslock(m_clients_mutex);
RecursiveMutexAutoLock clientslock(m_clients_mutex);
RemoteClient* client = lockedGetClientNoEx(i);
if (client)
client->PrintInfo(infostream);
Expand All @@ -724,7 +724,7 @@ void ClientInterface::send(session_t peer_id, u8 channelnum,

void ClientInterface::sendToAll(NetworkPacket *pkt)
{
MutexAutoLock clientslock(m_clients_mutex);
RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (auto &client_it : m_clients) {
RemoteClient *client = client_it.second;

Expand All @@ -739,7 +739,7 @@ void ClientInterface::sendToAll(NetworkPacket *pkt)
void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacypkt,
u16 min_proto_ver)
{
MutexAutoLock clientslock(m_clients_mutex);
RecursiveMutexAutoLock clientslock(m_clients_mutex);
for (auto &client_it : m_clients) {
RemoteClient *client = client_it.second;
NetworkPacket *pkt_to_send = nullptr;
Expand All @@ -763,7 +763,7 @@ void ClientInterface::sendToAllCompat(NetworkPacket *pkt, NetworkPacket *legacyp

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);
// The client may not exist; clients are immediately removed if their
// access is denied, and this event occurs later then.
Expand Down Expand Up @@ -792,7 +792,7 @@ RemoteClient* ClientInterface::lockedGetClientNoEx(session_t peer_id, ClientStat

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);
// The client may not exist; clients are immediately removed if their
// access is denied, and this event occurs later then.
Expand All @@ -804,7 +804,7 @@ ClientState ClientInterface::getClientState(session_t peer_id)

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);
// The client may not exist; clients are immediately removed if their
// access is denied, and this event occurs later then.
Expand All @@ -814,7 +814,7 @@ void ClientInterface::setPlayerName(session_t peer_id, const std::string &name)

void ClientInterface::DeleteClient(session_t peer_id)
{
MutexAutoLock conlock(m_clients_mutex);
RecursiveMutexAutoLock conlock(m_clients_mutex);

// Error check
RemoteClientMap::iterator n = m_clients.find(peer_id);
Expand Down Expand Up @@ -844,7 +844,7 @@ void ClientInterface::DeleteClient(session_t peer_id)

void ClientInterface::CreateClient(session_t peer_id)
{
MutexAutoLock conlock(m_clients_mutex);
RecursiveMutexAutoLock conlock(m_clients_mutex);

// Error check
RemoteClientMap::iterator n = m_clients.find(peer_id);
Expand All @@ -860,7 +860,7 @@ void ClientInterface::CreateClient(session_t peer_id)
void ClientInterface::event(session_t peer_id, ClientStateEvent event)
{
{
MutexAutoLock clientlock(m_clients_mutex);
RecursiveMutexAutoLock clientlock(m_clients_mutex);

// Error check
RemoteClientMap::iterator n = m_clients.find(peer_id);
Expand All @@ -881,7 +881,7 @@ void ClientInterface::event(session_t peer_id, ClientStateEvent event)

u16 ClientInterface::getProtocolVersion(session_t peer_id)
{
MutexAutoLock conlock(m_clients_mutex);
RecursiveMutexAutoLock conlock(m_clients_mutex);

// Error check
RemoteClientMap::iterator n = m_clients.find(peer_id);
Expand All @@ -896,7 +896,7 @@ u16 ClientInterface::getProtocolVersion(session_t peer_id)
void ClientInterface::setClientVersion(session_t peer_id, u8 major, u8 minor, u8 patch,
const std::string &full)
{
MutexAutoLock conlock(m_clients_mutex);
RecursiveMutexAutoLock conlock(m_clients_mutex);

// Error check
RemoteClientMap::iterator n = m_clients.find(peer_id);
Expand Down
2 changes: 1 addition & 1 deletion src/clientiface.h
View file
Expand Up @@ -501,7 +501,7 @@ class ClientInterface {

// Connection
std::shared_ptr<con::Connection> m_con;
std::mutex m_clients_mutex;
std::recursive_mutex m_clients_mutex;
// Connected clients (behind the con mutex)
RemoteClientMap m_clients;
std::vector<std::string> m_clients_names; //for announcing masterserver
Expand Down

0 comments on commit d73e458

Please sign in to comment.