JStringManager: thread safe

jafl · May 22, 2024 · 0bc453c · 0bc453c
1 parent a659a81
commit 0bc453c
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/libjcore/code/JStringManager.cpp b/libjcore/code/JStringManager.cpp
@@ -110,11 +110,11 @@ JStringManager::Get
 	const
 {
 	const JString* s;
-	if (GetItem(JString(id, JString::kNoCopy), &s))
+	if (GetItem(id, &s))
 	{
 		assert( s != nullptr );
 	}
-	else if (Contains(theMissingStringKey))	// ok to leak memory, because it should never happen
+	else if (Contains(theMissingStringKey))	// ok to leak memory, because it should never happen in release
 	{
 		std::cerr << "missing string id: " << id << std::endl;
 
@@ -206,8 +206,10 @@ JSubstitute*
 JStringManager::GetReplaceEngine()
 	const
 {
+	itsReplaceMutex.lock();
 	itsReplaceEngine->Reset();
 	itsReplaceEngine->IgnoreUnrecognized(true);
+	itsReplaceMutex.unlock();
 	return itsReplaceEngine;
 }
 
@@ -228,6 +230,8 @@ JStringManager::Replace
 	)
 	const
 {
+	itsReplaceMutex.lock();
+
 	JSubstitute* r = GetReplaceEngine();
 
 	const JSize count = size/(2*sizeof(JUtf8Byte*));
@@ -237,6 +241,8 @@ JStringManager::Replace
 	}
 
 	r->Substitute(str);
+
+	itsReplaceMutex.unlock();
 }
 
 /******************************************************************************

diff --git a/libjcore/code/JStringManager.h b/libjcore/code/JStringManager.h
@@ -53,9 +53,10 @@ class JStringManager : public JStringPtrMap<JString>
 
 private:
 
-	JString			itsBCP47Locale;
-	JSubstitute*	itsReplaceEngine;
-	static bool		thePseudotranslationFlag;
+	JString							itsBCP47Locale;
+	JSubstitute*					itsReplaceEngine;
+	mutable std::recursive_mutex	itsReplaceMutex;
+	static bool						thePseudotranslationFlag;
 
 private: