Skip to content

Added critical section to FMultiRegistry to make it thread-safe #7

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
tinyogre wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Added critical section to FMultiRegistry to make it thread-safe #7

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
10 changes: 10 additions & 0 deletions Source/AccelByteUe4Sdk/Private/Core/AccelByteMultiRegistry.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,12 @@
namespace AccelByte
{

FCriticalSection MultiRegistryMutex;

FApiClientPtr AccelByte::FMultiRegistry::GetApiClient(const FString &Key, bool bCreateIfNotFound)
{
FScopeLock Lock(&MultiRegistryMutex);

if (!ApiClientInstances.Contains(Key))
{
if (!bCreateIfNotFound)
Expand All @@ -35,6 +39,7 @@ FApiClientPtr AccelByte::FMultiRegistry::GetApiClient(const FString &Key, bool b

FServerApiClientPtr AccelByte::FMultiRegistry::GetServerApiClient(const FString &Key)
{
FScopeLock Lock(&MultiRegistryMutex);
if (!ServerApiClientInstances.Contains(Key))
{
FServerApiClientPtr NewClient = nullptr;
Expand All @@ -56,6 +61,7 @@ FServerApiClientPtr AccelByte::FMultiRegistry::GetServerApiClient(const FString

bool FMultiRegistry::RegisterApiClient(FString const &Key, FApiClientPtr ApiClient)
{
FScopeLock Lock(&MultiRegistryMutex);
bool bResult = false;

if (!Key.IsEmpty())
Expand All @@ -69,6 +75,7 @@ bool FMultiRegistry::RegisterApiClient(FString const &Key, FApiClientPtr ApiClie

bool FMultiRegistry::RemoveApiClient(const FString &Key)
{
FScopeLock Lock(&MultiRegistryMutex);
bool bResult = false;

if (!Key.IsEmpty())
Expand All @@ -82,6 +89,7 @@ bool FMultiRegistry::RemoveApiClient(const FString &Key)

bool FMultiRegistry::RemoveServerApiClient(const FString &Key)
{
FScopeLock Lock(&MultiRegistryMutex);
bool bResult = false;

if (!Key.IsEmpty())
Expand All @@ -95,6 +103,8 @@ bool FMultiRegistry::RemoveServerApiClient(const FString &Key)

void FMultiRegistry::Shutdown()
{
FScopeLock Lock(&MultiRegistryMutex);

TArray<FString> ApiClientKeys{};
ApiClientInstances.GenerateKeyArray(ApiClientKeys);
ApiClientKeys.Remove(TEXT("default"));
Expand Down