archive/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-09-21 03:41:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2461 from lioncash/barrier

Browse source 
Thread: Remove unused Barrier class
This commit is contained in:
Matthew Parlane 2015-05-27 13:21:14 +10:00
commit 3135b4f3e4
5 changed files with 6 additions and 46 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
Source/Core/Common/Thread.h
View file

@ -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

1
Source/Core/Core/HW/WiimoteReal/WiimoteReal.h
View file

@ -4,6 +4,7 @@
#pragma once
#include <condition_variable>
#include <mutex>
#include <string>
#include <thread>

3
Source/Core/Core/NetPlayClient.h
View file

@ -5,12 +5,13 @@
#pragma once
#include <map>
#include <mutex>
#include <queue>
#include <sstream>
#include <thread>
#include <SFML/Network/Packet.hpp>
#include "Common/CommonTypes.h"
#include "Common/FifoQueue.h"
#include "Common/Thread.h"
#include "Common/TraversalClient.h"
#include "Core/NetPlayProto.h"
#include "InputCommon/GCPadStatus.h"

3
Source/Core/Core/NetPlayServer.h
View file

@ -5,11 +5,12 @@
#pragma once
#include <map>
#include <mutex>
#include <queue>
#include <sstream>
#include <thread>
#include <unordered_set>
#include <SFML/Network/Packet.hpp>
#include "Common/Thread.h"
#include "Common/Timer.h"
#include "Common/TraversalClient.h"
#include "Core/NetPlayProto.h"

1
Source/Core/VideoCommon/RenderBase.h
View file

@ -14,6 +14,7 @@
#pragma once
#include <mutex>
#include <string>
#include "Common/MathUtil.h"