ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #12316 from JosJuice/android-less-host-thread-lock 

Android: Remove HostThreadLocks that are no longer needed
This commit is contained in:
Mai 2023-11-26 22:56:55 +01:00 committed by GitHub
parent 8a19be6052 5bda811a00
commit 10e2ad305d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Source/Android/jni/Config/NativeConfig.cpp
View File

@ -123,7 +123,6 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_loadGameInis
jstring jGameId, jstring jGameId,
jint jRevision) jint jRevision)
{ {
HostThreadLock guard;
const std::string game_id = GetJString(env, jGameId); const std::string game_id = GetJString(env, jGameId);
const u16 revision = static_cast<u16>(jRevision); const u16 revision = static_cast<u16>(jRevision);
Config::AddLayer(ConfigLoaders::GenerateGlobalGameConfigLoader(game_id, revision)); Config::AddLayer(ConfigLoaders::GenerateGlobalGameConfigLoader(game_id, revision));
@ -133,7 +132,6 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_loadGameInis
JNIEXPORT void JNICALL JNIEXPORT void JNICALL
Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_unloadGameInis(JNIEnv*, jclass) Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_unloadGameInis(JNIEnv*, jclass)
{ {
HostThreadLock guard;
Config::RemoveLayer(Config::LayerType::GlobalGame); Config::RemoveLayer(Config::LayerType::GlobalGame);
Config::RemoveLayer(Config::LayerType::LocalGame); Config::RemoveLayer(Config::LayerType::LocalGame);
} }
@ -141,7 +139,10 @@ Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_unloadGameIn
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_save( JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_save(
JNIEnv*, jclass, jint layer) JNIEnv*, jclass, jint layer)
{ {
// HostThreadLock is used to ensure we don't try to save to SYSCONF at the same time as
// emulation shutdown does
HostThreadLock guard; HostThreadLock guard;
return GetLayer(layer, {})->Save(); return GetLayer(layer, {})->Save();
} }
@ -149,7 +150,6 @@ JNIEXPORT void JNICALL
Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_deleteAllKeys(JNIEnv*, jclass, Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_deleteAllKeys(JNIEnv*, jclass,
jint layer) jint layer)
{ {
HostThreadLock guard;
return GetLayer(layer, {})->DeleteAllKeys(); return GetLayer(layer, {})->DeleteAllKeys();
} }
@ -166,7 +166,6 @@ JNIEXPORT jboolean JNICALL
Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_deleteKey( Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_deleteKey(
JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key) JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key)
{ {
HostThreadLock guard;
const Config::Location location = GetLocation(env, file, section, key); const Config::Location location = GetLocation(env, file, section, key);
const bool had_value = GetLayer(layer, location)->DeleteKey(location); const bool had_value = GetLayer(layer, location)->DeleteKey(location);
if (had_value) if (had_value)
@ -220,7 +219,6 @@ JNIEXPORT void JNICALL
Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setString( Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setString(
JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jstring value) JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jstring value)
{ {
HostThreadLock guard;
return Set(layer, GetLocation(env, file, section, key), GetJString(env, value)); return Set(layer, GetLocation(env, file, section, key), GetJString(env, value));
} }
@ -228,21 +226,18 @@ JNIEXPORT void JNICALL
Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setBoolean( Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setBoolean(
JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jboolean value) JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jboolean value)
{ {
HostThreadLock guard;
return Set(layer, GetLocation(env, file, section, key), static_cast<bool>(value)); return Set(layer, GetLocation(env, file, section, key), static_cast<bool>(value));
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setInt( JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setInt(
JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jint value) JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jint value)
{ {
HostThreadLock guard;
return Set(layer, GetLocation(env, file, section, key), value); return Set(layer, GetLocation(env, file, section, key), value);
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setFloat( JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_features_settings_model_NativeConfig_setFloat(
JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jfloat value) JNIEnv* env, jclass, jint layer, jstring file, jstring section, jstring key, jfloat value)
{ {
HostThreadLock guard;
return Set(layer, GetLocation(env, file, section, key), value); return Set(layer, GetLocation(env, file, section, key), value);
} }
} }

6
Source/Android/jni/MainAndroid.cpp
View File

@ -531,18 +531,12 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_Initialize(J
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReportStartToAnalytics(JNIEnv*, JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_ReportStartToAnalytics(JNIEnv*,
jclass) jclass)
{ {
// Identity generation ends up calling config code, and some config callbacks use RunAsCPUThread
HostThreadLock guard;
DolphinAnalytics::Instance().ReportDolphinStart(GetAnalyticValue("DEVICE_TYPE")); DolphinAnalytics::Instance().ReportDolphinStart(GetAnalyticValue("DEVICE_TYPE"));
} }
JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GenerateNewStatisticsId(JNIEnv*, JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GenerateNewStatisticsId(JNIEnv*,
jclass) jclass)
{ {
// Identity generation ends up calling config code, and some config callbacks use RunAsCPUThread
HostThreadLock guard;
DolphinAnalytics::Instance().GenerateNewIdentity(); DolphinAnalytics::Instance().GenerateNewIdentity();
} }