diff options
| author | Lioncash <mathew1800@gmail.com> | 2015-05-26 17:23:43 -0400 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-05-26 19:25:59 -0400 |
| commit | 23c11b3f27e0815c03e80730f3cfbcbc9353a86a (patch) | |
| tree | b9e1398da3e7d01602b4c2648f12a19d528e82f0 /Source/Core/Common/Thread.h | |
| parent | 5d3a248811e3c836cc34d7af1a11de91f3132829 (diff) | |
Thread: Remove unused Barrier class
Diffstat (limited to 'Source/Core/Common/Thread.h')
| -rw-r--r-- | Source/Core/Common/Thread.h | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/Source/Core/Common/Thread.h b/Source/Core/Common/Thread.h index 33802a20b7..359137b8fe 100644 --- a/Source/Core/Common/Thread.h +++ b/Source/Core/Common/Thread.h @@ -4,10 +4,6 @@ #pragma once -#include <condition_variable> -#include <cstdio> -#include <cstring> -#include <mutex> #include <thread> // Don't include Common.h here as it will break LogManager @@ -18,10 +14,6 @@ #ifndef INFINITE #define INFINITE 0xffffffff #endif - -//for gettimeofday and struct time(spec|val) -#include <time.h> -#include <sys/time.h> #endif namespace Common @@ -32,42 +24,6 @@ int CurrentThreadId(); void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask); void SetCurrentThreadAffinity(u32 mask); -// TODO: doesn't work on Windows with (count > 2) -class Barrier -{ -public: - Barrier(size_t count) - : m_count(count), m_waiting(0) - {} - - // block until "count" threads call Sync() - bool Sync() - { - std::unique_lock<std::mutex> lk(m_mutex); - - // TODO: broken when next round of Sync()s - // is entered before all waiting threads return from the notify_all - - if (m_count == ++m_waiting) - { - m_waiting = 0; - m_condvar.notify_all(); - return true; - } - else - { - m_condvar.wait(lk, [&]{ return (0 == m_waiting); }); - return false; - } - } - -private: - std::condition_variable m_condvar; - std::mutex m_mutex; - const size_t m_count; - volatile size_t m_waiting; -}; - void SleepCurrentThread(int ms); void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms |