Rim/iw4x-client
Rim/iw4x-client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #438 from diamante0018/fix-chat-concurrency

Browse Source 
[Chat] Improve code
This commit is contained in:
Dss0 2022-08-18 12:18:53 +02:00 committed by GitHub
commit 33cbd3f1c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/Components/Modules/Chat.cpp
View File

@ -11,8 +11,7 @@ namespace Components
bool Chat::SendChat; bool Chat::SendChat;
std::mutex Chat::AccessMutex; Utils::Concurrency::Container<Chat::muteList> Chat::MutedList;
std::unordered_set<std::uint64_t> Chat::MuteList;
bool Chat::CanAddCallback = true; bool Chat::CanAddCallback = true;
std::vector<Scripting::Function> Chat::SayCallbacks; std::vector<Scripting::Function> Chat::SayCallbacks;
@ -36,21 +35,13 @@ namespace Components
++text; ++text;
} }
std::unique_lock lock(AccessMutex); if (IsMuted(player))
if (MuteList.contains(Game::svs_clients[player->s.number].steamID))
{ {
lock.unlock();
SendChat = false; SendChat = false;
Game::SV_GameSendServerCommand(player->s.number, Game::SV_CMD_CAN_IGNORE, Game::SV_GameSendServerCommand(player->s.number, Game::SV_CMD_CAN_IGNORE,
Utils::String::VA("%c \"You are muted\"", 0x65)); Utils::String::VA("%c \"You are muted\"", 0x65));
} }
// Test whether the lock is still locked
if (lock.owns_lock())
{
lock.unlock();
}
for (const auto& callback : SayCallbacks) for (const auto& callback : SayCallbacks)
{ {
if (!ChatCallback(player, callback.getPos(), (text + 1), mode)) if (!ChatCallback(player, callback.getPos(), (text + 1), mode))
@ -243,25 +234,34 @@ namespace Components
} }
} }
bool Chat::IsMuted(const Game::gentity_s* ent)
{
auto result = false;
const auto clientNum = ent->s.number;
const auto xuid = Game::svs_clients[clientNum].steamID;
MutedList.access([&](muteList& clients)
{
if (clients.contains(xuid))
{
result = true;
}
});
return result;
}
void Chat::MuteClient(const Game::client_t* client) void Chat::MuteClient(const Game::client_t* client)
{ {
std::unique_lock lock(AccessMutex); const auto xuid = client->steamID;
MutedList.access([&](muteList& clients)
if (!MuteList.contains(client->steamID))
{ {
MuteList.insert(client->steamID); clients.insert(xuid);
lock.unlock(); });
Logger::Print("{} was muted\n", client->name); Logger::Print("{} was muted\n", client->name);
Game::SV_GameSendServerCommand(client->gentity->s.number, Game::SV_CMD_CAN_IGNORE, Game::SV_GameSendServerCommand(client - Game::svs_clients, Game::SV_CMD_CAN_IGNORE,
Utils::String::VA("%c \"You were muted\"", 0x65)); Utils::String::VA("%c \"You were muted\"", 0x65));
return;
}
lock.unlock();
Logger::Print("{} is already muted\n", client->name);
Game::SV_GameSendServerCommand(-1, Game::SV_CMD_CAN_IGNORE,
Utils::String::VA("%c \"%s is already muted\"", 0x65, client->name));
} }
void Chat::UnmuteClient(const Game::client_t* client) void Chat::UnmuteClient(const Game::client_t* client)
@ -269,18 +269,19 @@ namespace Components
UnmuteInternal(client->steamID); UnmuteInternal(client->steamID);
Logger::Print("{} was unmuted\n", client->name); Logger::Print("{} was unmuted\n", client->name);
Game::SV_GameSendServerCommand(client->gentity->s.number, Game::SV_CMD_CAN_IGNORE, Game::SV_GameSendServerCommand(client - Game::svs_clients, Game::SV_CMD_CAN_IGNORE,
Utils::String::VA("%c \"You were unmuted\"", 0x65)); Utils::String::VA("%c \"You were unmuted\"", 0x65));
} }
void Chat::UnmuteInternal(const std::uint64_t id, bool everyone) void Chat::UnmuteInternal(const std::uint64_t id, bool everyone)
{ {
std::unique_lock lock(AccessMutex); MutedList.access([&](muteList& clients)
{
if (everyone) if (everyone)
MuteList.clear(); clients.clear();
else else
MuteList.erase(id); clients.erase(id);
});
} }
void Chat::AddChatCommands() void Chat::AddChatCommands()
@ -360,7 +361,7 @@ namespace Components
const auto* result = &Game::scrVmPub->top[1 - Game::scrVmPub->outparamcount]; const auto* result = &Game::scrVmPub->top[1 - Game::scrVmPub->outparamcount];
if (result->type != Game::scrParamType_t::VAR_INTEGER) if (result->type != Game::VAR_INTEGER)
{ {
// Garbage was returned // Garbage was returned
return 1; return 1;
@ -378,7 +379,7 @@ namespace Components
Game::Scr_AddString(message); Game::Scr_AddString(message);
Game::VariableValue value; Game::VariableValue value;
value.type = Game::scrParamType_t::VAR_OBJECT; value.type = Game::VAR_OBJECT;
value.u.uintValue = entityId; value.u.uintValue = entityId;
Game::AddRefToValue(value.type, value.u); Game::AddRefToValue(value.type, value.u);

7
src/Components/Modules/Chat.hpp
View File

@ -18,8 +18,8 @@ namespace Components
static bool SendChat; static bool SendChat;
static std::mutex AccessMutex; using muteList = std::unordered_set<std::uint64_t>;
static std::unordered_set<std::uint64_t> MuteList; static Utils::Concurrency::Container<muteList> MutedList;
static bool CanAddCallback; // ClientCommand & GSC thread are the same static bool CanAddCallback; // ClientCommand & GSC thread are the same
static std::vector<Scripting::Function> SayCallbacks; static std::vector<Scripting::Function> SayCallbacks;
@ -33,9 +33,10 @@ namespace Components
static void CG_AddToTeamChat(const char* text); static void CG_AddToTeamChat(const char* text);
static void CG_AddToTeamChat_Stub(); static void CG_AddToTeamChat_Stub();
static bool IsMuted(const Game::gentity_s* ent);
static void MuteClient(const Game::client_t* client); static void MuteClient(const Game::client_t* client);
static void UnmuteClient(const Game::client_t* client); static void UnmuteClient(const Game::client_t* client);
static void UnmuteInternal(const std::uint64_t id, bool everyone = false); static void UnmuteInternal(std::uint64_t id, bool everyone = false);
static void AddChatCommands(); static void AddChatCommands();
static int GetCallbackReturn(); static int GetCallbackReturn();