mirror of
https://github.com/yuzu-mirror/yuzu.git
synced 2024-09-09 14:49:09 +01:00
Common: thread.h cleanups
The helper classes are rendered obsolete by C++11 lambdas. Also made formatting conform to our code style.
This commit is contained in:
parent
3ee9f6c5d8
commit
6402de9ae7
1 changed files with 16 additions and 65 deletions
|
@ -51,109 +51,60 @@ int CurrentThreadId();
|
||||||
void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
|
void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
|
||||||
void SetCurrentThreadAffinity(u32 mask);
|
void SetCurrentThreadAffinity(u32 mask);
|
||||||
|
|
||||||
class Event
|
class Event {
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Event()
|
Event() : is_set(false) {}
|
||||||
: is_set(false)
|
|
||||||
{}
|
|
||||||
|
|
||||||
void Set()
|
void Set() {
|
||||||
{
|
|
||||||
std::lock_guard<std::mutex> lk(m_mutex);
|
std::lock_guard<std::mutex> lk(m_mutex);
|
||||||
if (!is_set)
|
if (!is_set) {
|
||||||
{
|
|
||||||
is_set = true;
|
is_set = true;
|
||||||
m_condvar.notify_one();
|
m_condvar.notify_one();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void Wait()
|
void Wait() {
|
||||||
{
|
|
||||||
std::unique_lock<std::mutex> lk(m_mutex);
|
std::unique_lock<std::mutex> lk(m_mutex);
|
||||||
m_condvar.wait(lk, IsSet(this));
|
m_condvar.wait(lk, [&]{ return is_set; });
|
||||||
is_set = false;
|
is_set = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
void Reset()
|
void Reset() {
|
||||||
{
|
|
||||||
std::unique_lock<std::mutex> lk(m_mutex);
|
std::unique_lock<std::mutex> lk(m_mutex);
|
||||||
// no other action required, since wait loops on the predicate and any lingering signal will get cleared on the first iteration
|
// no other action required, since wait loops on the predicate and any lingering signal will get cleared on the first iteration
|
||||||
is_set = false;
|
is_set = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
class IsSet
|
bool is_set;
|
||||||
{
|
|
||||||
public:
|
|
||||||
IsSet(const Event* ev)
|
|
||||||
: m_event(ev)
|
|
||||||
{}
|
|
||||||
|
|
||||||
bool operator()()
|
|
||||||
{
|
|
||||||
return m_event->is_set;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
const Event* const m_event;
|
|
||||||
};
|
|
||||||
|
|
||||||
volatile bool is_set;
|
|
||||||
std::condition_variable m_condvar;
|
std::condition_variable m_condvar;
|
||||||
std::mutex m_mutex;
|
std::mutex m_mutex;
|
||||||
};
|
};
|
||||||
|
|
||||||
// TODO: doesn't work on windows with (count > 2)
|
class Barrier {
|
||||||
class Barrier
|
|
||||||
{
|
|
||||||
public:
|
public:
|
||||||
Barrier(size_t count)
|
Barrier(size_t count) : m_count(count), m_waiting(0) {}
|
||||||
: m_count(count), m_waiting(0)
|
|
||||||
{}
|
|
||||||
|
|
||||||
// block until "count" threads call Sync()
|
/// Blocks until all "count" threads have called Sync()
|
||||||
bool Sync()
|
void Sync() {
|
||||||
{
|
|
||||||
std::unique_lock<std::mutex> lk(m_mutex);
|
std::unique_lock<std::mutex> lk(m_mutex);
|
||||||
|
|
||||||
// TODO: broken when next round of Sync()s
|
// TODO: broken when next round of Sync()s
|
||||||
// is entered before all waiting threads return from the notify_all
|
// is entered before all waiting threads return from the notify_all
|
||||||
|
|
||||||
if (m_count == ++m_waiting)
|
if (++m_waiting == m_count) {
|
||||||
{
|
|
||||||
m_waiting = 0;
|
m_waiting = 0;
|
||||||
m_condvar.notify_all();
|
m_condvar.notify_all();
|
||||||
return true;
|
} else {
|
||||||
}
|
m_condvar.wait(lk, [&]{ return m_waiting == 0; });
|
||||||
else
|
|
||||||
{
|
|
||||||
m_condvar.wait(lk, IsDoneWating(this));
|
|
||||||
return false;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
class IsDoneWating
|
|
||||||
{
|
|
||||||
public:
|
|
||||||
IsDoneWating(const Barrier* bar)
|
|
||||||
: m_bar(bar)
|
|
||||||
{}
|
|
||||||
|
|
||||||
bool operator()()
|
|
||||||
{
|
|
||||||
return (0 == m_bar->m_waiting);
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
|
||||||
const Barrier* const m_bar;
|
|
||||||
};
|
|
||||||
|
|
||||||
std::condition_variable m_condvar;
|
std::condition_variable m_condvar;
|
||||||
std::mutex m_mutex;
|
std::mutex m_mutex;
|
||||||
const size_t m_count;
|
const size_t m_count;
|
||||||
volatile size_t m_waiting;
|
size_t m_waiting;
|
||||||
};
|
};
|
||||||
|
|
||||||
void SleepCurrentThread(int ms);
|
void SleepCurrentThread(int ms);
|
||||||
|
|
Loading…
Reference in a new issue