RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-25 12:12:50 +01:00
Code Issues Releases Wiki Activity

Hotfix (#1705)

Browse Source
This commit is contained in:
Ivan 2016-05-24 01:59:39 +03:00
parent cdefb969ec
commit edc92843a7
5 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utilities/File.cpp
View File

@ -1169,7 +1169,7 @@ const std::string& fs::get_executable_dir()
wchar_t buf[2048];
if (GetModuleFileName(NULL, buf, ::size32(buf)) - 1 >= ::size32(buf) - 1)
{
MessageBoxA(0, fmt::format("GetModuleFileName() failed: error %u.", GetLastError()).c_str(), "fs::get_config_dir()", MB_ICONERROR);
MessageBoxA(0, fmt::format("GetModuleFileName() failed: error %u.", GetLastError()).c_str(), "fs::get_executable_dir()", MB_ICONERROR);
return dir; // empty
}

17
Utilities/sync.h
View File

@ -38,38 +38,35 @@ namespace util
{
while (true)
{
NtWaitForKeyedEvent(NULL, &key, FALSE, NULL);
u32 read = key.load();
u32 copy = read;
while (pred(read), read != copy)
while (func(read), read != copy)
{
read = key.compare_and_swap(copy, read);
if (copy == read)
{
break;
return;
}
copy = read;
}
NtWaitForKeyedEvent(NULL, &key, FALSE, NULL);
}
}
// Try to wake up a thread.
inline bool keyed_post(atomic_t<u32>& key, u32 acknowledged_value)
{
LARGE_INTEGER zero;
zero.QuadPart = 0;
LARGE_INTEGER timeout;
timeout.QuadPart = -50;
while (UNLIKELY(NtReleaseKeyedEvent(NULL, &key, FALSE, &zero) == WAIT_TIMEOUT))
while (UNLIKELY(NtReleaseKeyedEvent(NULL, &key, FALSE, &timeout) != ERROR_SUCCESS))
{
if (key.load() != acknowledged_value)
return false;
//NtReleaseKeyedEvent(NULL, &key, FALSE, NULL);
//return true;
}
return true;

35
rpcs3/Emu/Memory/wait_engine.cpp
View File

@ -22,13 +22,34 @@ namespace vm
this->mask = ~(size - 1);
this->thread = thread_ctrl::get_current();
struct waiter final
{
writer_lock lock(s_mutex);
s_waiters.emplace(this);
waiter_base* m_ptr;
thread_ctrl* m_thread;
waiter(waiter_base* ptr)
: m_ptr(ptr)
, m_thread(ptr->thread)
{
// Initialize waiter
writer_lock{s_mutex}, s_waiters.emplace(m_ptr);
m_thread->lock();
}
~waiter()
{
// Reset thread
atomic_storage<thread_ctrl*>::store(m_ptr->thread, nullptr);
m_thread->unlock();
// Remove waiter
writer_lock{s_mutex}, s_waiters.erase(m_ptr);
}
};
// Wait until thread == nullptr
thread_lock(), thread_ctrl::wait(WRAP_EXPR(!thread || test()));
waiter{this}, thread_ctrl::wait(WRAP_EXPR(!thread || test()));
}
bool waiter_base::try_notify()
@ -66,12 +87,6 @@ namespace vm
return true;
}
waiter_base::~waiter_base()
{
writer_lock lock(s_mutex);
s_waiters.erase(this);
}
void notify_at(u32 addr, u32 size)
{
reader_lock lock(s_mutex);
@ -111,7 +126,7 @@ namespace vm
while (!Emu.IsStopped())
{
// Poll waiters periodically (TODO)
while (notify_all() && !Emu.IsPaused())
while (notify_all() && !Emu.IsPaused() && !Emu.IsStopped())
{
thread_ctrl::sleep(50);
}

2
rpcs3/Emu/Memory/wait_engine.h
View File

@ -17,8 +17,6 @@ namespace vm
bool try_notify();
protected:
~waiter_base();
virtual bool test() = 0;
};

4
rpcs3/Loader/PSF.cpp
View File

@ -216,7 +216,7 @@ namespace psf
}
// Skip padding
stream.seek(header.off_data_table);
stream.trunc(stream.seek(header.off_data_table));
// Save data
for (const auto& entry : psf)
@ -241,7 +241,7 @@ namespace psf
}
stream.write(value);
stream.seek(max - size, fs::seek_cur); // Skip up to max_size
stream.trunc(stream.seek(max - size, fs::seek_cur)); // Skip up to max_size
}
else
{