dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Iconv: Ensure that OTTD2FS/FS2OTTD are thread-safe"

Browse Source 
This reverts commit 94d326b1e0.
This commit is contained in:
Jonathan G Rennison
2024-02-21 00:53:18 +00:00
parent 4469925605
commit c2d581a928
1 changed files with 12 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/os/unix/unix.cpp
View File

@@ -24,7 +24,6 @@
#include <time.h> #include <time.h>
#include <signal.h> #include <signal.h>
#include <pthread.h> #include <pthread.h>
#include <atomic>
#ifdef WITH_SDL2 #ifdef WITH_SDL2
#include <SDL.h> #include <SDL.h>
@@ -161,8 +160,6 @@ static std::string convert_tofrom_fs(iconv_t convd, const std::string &name)
return buf; return buf;
} }
std::mutex _iconv_convd_mutex;
/** /**
* Convert from OpenTTD's encoding to that of the local environment * Convert from OpenTTD's encoding to that of the local environment
* @param name pointer to a valid string that will be converted * @param name pointer to a valid string that will be converted
@@ -170,25 +167,17 @@ std::mutex _iconv_convd_mutex;
*/ */
std::string OTTD2FS(const std::string &name) std::string OTTD2FS(const std::string &name)
{ {
static std::atomic<iconv_t> convd{(iconv_t)(-1)}; static iconv_t convd = (iconv_t)(-1);
iconv_t local_convd = convd.load(std::memory_order_relaxed); if (convd == (iconv_t)(-1)) {
if (local_convd == (iconv_t)(-1)) {
{
std::unique_lock<std::mutex> lock(_iconv_convd_mutex);
local_convd = convd.load(); // Load a second time now that the lock is acquired
if (local_convd == (iconv_t)(-1)) {
const char *env = GetLocalCode(); const char *env = GetLocalCode();
local_convd = iconv_open(env, INTERNALCODE); convd = iconv_open(env, INTERNALCODE);
if (local_convd != (iconv_t)(-1)) convd.store(local_convd); if (convd == (iconv_t)(-1)) {
}
}
if (local_convd == (iconv_t)(-1)) {
DEBUG(misc, 0, "[iconv] conversion from codeset '%s' to '%s' unsupported", INTERNALCODE, env); DEBUG(misc, 0, "[iconv] conversion from codeset '%s' to '%s' unsupported", INTERNALCODE, env);
return name; return name;
} }
} }
return convert_tofrom_fs(local_convd, name); return convert_tofrom_fs(convd, name);
} }
/** /**
@@ -198,25 +187,17 @@ std::string OTTD2FS(const std::string &name)
*/ */
std::string FS2OTTD(const std::string &name) std::string FS2OTTD(const std::string &name)
{ {
static std::atomic<iconv_t> convd{(iconv_t)(-1)}; static iconv_t convd = (iconv_t)(-1);
iconv_t local_convd = convd.load(std::memory_order_relaxed); if (convd == (iconv_t)(-1)) {
if (local_convd == (iconv_t)(-1)) {
{
std::unique_lock<std::mutex> lock(_iconv_convd_mutex);
local_convd = convd.load(); // Load a second time now that the lock is acquired
if (local_convd == (iconv_t)(-1)) {
const char *env = GetLocalCode(); const char *env = GetLocalCode();
local_convd = iconv_open(INTERNALCODE, env); convd = iconv_open(INTERNALCODE, env);
if (local_convd != (iconv_t)(-1)) convd.store(local_convd); if (convd == (iconv_t)(-1)) {
}
}
if (local_convd == (iconv_t)(-1)) {
DEBUG(misc, 0, "[iconv] conversion from codeset '%s' to '%s' unsupported", env, INTERNALCODE); DEBUG(misc, 0, "[iconv] conversion from codeset '%s' to '%s' unsupported", env, INTERNALCODE);
return name; return name;
} }
} }
return convert_tofrom_fs(local_convd, name); return convert_tofrom_fs(convd, name);
} }
#endif /* WITH_ICONV */ #endif /* WITH_ICONV */