dahjah/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2026-06-04 13:55:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Temporarily disable memory locking if TSX is not used

Browse Source 
It's a very heavy operation that could cause some problem under mutex lock.
This commit is contained in:
Nekotekina 2020-11-14 11:12:58 +03:00
parent 5b69eda39a
commit 1e269751bf
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
rpcs3/Emu/Memory/vm.cpp
View File

@ -766,7 +766,11 @@ namespace vm
perf_meter<"PAGE_LCK"_u64> perf1; perf_meter<"PAGE_LCK"_u64> perf1;
if (!utils::memory_lock(g_sudo_addr + addr, size)) if (!g_use_rtm)
{
perf1.reset();
}
else if (!utils::memory_lock(g_sudo_addr + addr, size))
{ {
vm_log.error("Failed to lock memory. Consider increasing your system limits.\n" vm_log.error("Failed to lock memory. Consider increasing your system limits.\n"
"addr=0x%x, size=0x%x, shm=%d, shm:[f=%d,l=%u]", addr, size, +!!shm, shm ? shm->flags() : 0, shm ? shm->info : 0); "addr=0x%x, size=0x%x, shm=%d, shm:[f=%d,l=%u]", addr, size, +!!shm, shm ? shm->flags() : 0, shm ? shm->info : 0);