piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-23 06:09:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix Common::Barrier and fix the deadlock by making Common::Event check to see if an event has already been set or not.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7305 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice
2011-03-05 22:17:28 +00:00
parent 024a87af7a
commit 7bc2ae01f2
4 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
Source/Core/Common/Src/Thread.h
View File

@ -51,18 +51,29 @@ void SetCurrentThreadAffinity(u32 mask);
class Event
{
public:
Event()
: is_set(false)
{};
void Set()
{
m_condvar.notify_one();
if (!is_set)
{
is_set = true;
m_condvar.notify_one();
}
}
void Wait()
{
std::unique_lock<std::mutex> lk(m_mutex);
m_condvar.wait(lk);
if (!is_set)
m_condvar.wait(lk);
is_set = false;
}
private:
bool is_set;
std::condition_variable m_condvar;
std::mutex m_mutex;
};
@ -71,10 +82,6 @@ private:
class Barrier
{
public:
Barrier()
: m_count(2), m_waiting(0)
{}
Barrier(size_t count)
: m_count(count), m_waiting(0)
{}
@ -84,7 +91,7 @@ public:
{
std::unique_lock<std::mutex> lk(m_mutex);
if (m_count >= ++m_waiting)
if (m_count == ++m_waiting)
{
m_waiting = 0;
m_condvar.notify_all();