Merge pull request #12964 from mitaclaw/jit-profiling-android-correctness

MainAndroid: Thread Correctness In WriteJitBlockLogDump
This commit is contained in:
OatmealDome 2024-07-29 16:05:47 -04:00 committed by GitHub
commit 75d49842c4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 2 additions and 1 deletions

View File

@ -417,6 +417,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_WriteJitBloc
HostThreadLock guard; HostThreadLock guard;
auto& system = Core::System::GetInstance(); auto& system = Core::System::GetInstance();
auto& jit_interface = system.GetJitInterface(); auto& jit_interface = system.GetJitInterface();
const Core::CPUThreadGuard cpu_guard(system);
if (jit_interface.GetCore() == nullptr) if (jit_interface.GetCore() == nullptr)
{ {
env->CallStaticVoidMethod(native_library_class, IDCache::GetDisplayToastMsg(), env->CallStaticVoidMethod(native_library_class, IDCache::GetDisplayToastMsg(),
@ -434,7 +435,7 @@ JNIEXPORT void JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_WriteJitBloc
JNI_FALSE); JNI_FALSE);
return; return;
} }
jit_interface.JitBlockLogDump(Core::CPUThreadGuard{system}, f.GetHandle()); jit_interface.JitBlockLogDump(cpu_guard, f.GetHandle());
env->CallStaticVoidMethod(native_library_class, IDCache::GetDisplayToastMsg(), env->CallStaticVoidMethod(native_library_class, IDCache::GetDisplayToastMsg(),
ToJString(env, Common::FmtFormatT("Wrote to \"{0}\".", filename)), ToJString(env, Common::FmtFormatT("Wrote to \"{0}\".", filename)),
JNI_FALSE); JNI_FALSE);