archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-09 00:11:24 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small fix

Browse source
This commit is contained in:
Nekotekina 2015-02-07 23:06:35 +03:00
parent e70875ad5c
commit 90c021fc31
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rpcs3/Emu/Memory/vm.cpp
View file

@ -84,13 +84,11 @@ namespace vm
{ {
std::atomic<NamedThreadBase*> m_owner; std::atomic<NamedThreadBase*> m_owner;
std::condition_variable m_cv; std::condition_variable m_cv;
std::atomic<u32> test;
std::mutex m_cv_mutex; std::mutex m_cv_mutex;
public: public:
reservation_mutex_t() reservation_mutex_t()
: m_owner(nullptr) : m_owner(nullptr)
, test(0)
{ {
} }
@ -116,16 +114,10 @@ namespace vm
} }
do_notify = true; do_notify = true;
test++;
assert(test == 1);
} }
__noinline void unlock() __noinline void unlock()
{ {
assert(test == 1);
test--;
NamedThreadBase* owner = GetCurrentNamedThread(); NamedThreadBase* owner = GetCurrentNamedThread();
if (!m_owner.compare_exchange_strong(owner, nullptr)) if (!m_owner.compare_exchange_strong(owner, nullptr))
@ -206,7 +198,7 @@ namespace vm
bool reservation_acquire(void* data, u32 addr, u32 size, const std::function<void()>& callback) bool reservation_acquire(void* data, u32 addr, u32 size, const std::function<void()>& callback)
{ {
const auto stamp0 = get_time(); //const auto stamp0 = get_time();
bool broken = false; bool broken = false;
@ -217,7 +209,7 @@ namespace vm
std::lock_guard<reservation_mutex_t> lock(g_reservation_mutex); std::lock_guard<reservation_mutex_t> lock(g_reservation_mutex);
// silent unlocking to prevent priority boost for threads going to break reservation // silent unlocking to prevent priority boost for threads going to break reservation
g_reservation_mutex.do_notify = false; //g_reservation_mutex.do_notify = false;
// break previous reservation // break previous reservation
if (g_reservation_addr) if (g_reservation_addr)
@ -228,6 +220,9 @@ namespace vm
// change memory protection to read-only // change memory protection to read-only
_reservation_set(addr); _reservation_set(addr);
// may not be necessary, just for sure:
_mm_mfence();
// set additional information // set additional information
g_reservation_addr = addr; g_reservation_addr = addr;
g_reservation_owner = GetCurrentNamedThread(); g_reservation_owner = GetCurrentNamedThread();
@ -313,6 +308,9 @@ namespace vm
g_reservation_owner = GetCurrentNamedThread(); g_reservation_owner = GetCurrentNamedThread();
g_reservation_cb = nullptr; g_reservation_cb = nullptr;
// may not be necessary, just for sure:
_mm_mfence();
// do the operation // do the operation
proc(); proc();