Skip to content

fix(server/state): scope our access to the client properly to prevent deadlock #4008

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AvarianKnight wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix(server/state): scope our access to the client properly to prevent deadlock #4008

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 31 additions & 20 deletions code/components/citizen-server-impl/src/state/ServerGameState_Scripting.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1627,9 +1627,15 @@ static void Init()

// get the server's game state
auto gameState = instance->GetComponent<fx::ServerGameState>();

uint32_t routingBucket = 0;

auto [lock, clientData] = gameState->ExternalGetClientData(client);
return int(clientData->routingBucket);
{
auto [lock, clientData] = gameState->ExternalGetClientData(client);
routingBucket = clientData->routingBucket;
}

return int(routingBucket);
}));

fx::ScriptEngine::RegisterNativeHandler("SET_PLAYER_ROUTING_BUCKET", MakeClientFunction([](fx::ScriptContext& context, const fx::ClientSharedPtr& client)
Expand All @@ -1649,26 +1655,31 @@ static void Init()

// get the server's game state
auto gameState = instance->GetComponent<fx::ServerGameState>();

auto [lock, clientData] = gameState->ExternalGetClientData(client);

// store old bucket for event
const auto oldBucket = clientData->routingBucket;

gameState->ClearClientFromWorldGrid(client);
clientData->routingBucket = bucket;

fx::sync::SyncEntityPtr playerEntity;

{
std::shared_lock _lock(clientData->playerEntityMutex);
playerEntity = clientData->playerEntity.lock();
}

uint32_t oldBucket = 0;

if (playerEntity)
{
playerEntity->routingBucket = bucket;
}
{
auto [lock, clientData] = gameState->ExternalGetClientData(client);

// store old bucket for event
oldBucket = clientData->routingBucket;

gameState->ClearClientFromWorldGrid(client);
clientData->routingBucket = bucket;

fx::sync::SyncEntityPtr playerEntity;

{
std::shared_lock _lock(clientData->playerEntityMutex);
playerEntity = clientData->playerEntity.lock();
}

if (playerEntity)
{
playerEntity->routingBucket = bucket;
}
}


auto eventManager = resourceManager->GetComponent<fx::ResourceEventManagerComponent>();
Expand Down
Loading