citra-emu
/
citra-canary
Archived
1
0
Fork 0
Code

Merge pull request #4458 from FearlessTobi/port-1773 

Port yuzu-emu/yuzu#1773: "common/thread: Minor cleanup"
This commit is contained in:
Weiyi Wang 2018-11-28 11:07:48 -05:00 committed by GitHub
parent f7fb5875a0 00564bdb6f
commit b37d3be34e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/common/thread.cpp
View File

@ -25,23 +25,6 @@
namespace Common { namespace Common {
int CurrentThreadId() {
#ifdef _MSC_VER
return GetCurrentThreadId();
#elif defined __APPLE__
return mach_thread_self();
#else
return 0;
#endif
}
#ifdef _WIN32
// Supporting functions
void SleepCurrentThread(int ms) {
Sleep(ms);
}
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask) { void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask) {
@ -62,7 +45,7 @@ void SwitchCurrentThread() {
// This is implemented much nicer in upcoming msvc++, see: // This is implemented much nicer in upcoming msvc++, see:
// http://msdn.microsoft.com/en-us/library/xcb2z8hs(VS.100).aspx // http://msdn.microsoft.com/en-us/library/xcb2z8hs(VS.100).aspx
void SetCurrentThreadName(const char* szThreadName) { void SetCurrentThreadName(const char* name) {
static const DWORD MS_VC_EXCEPTION = 0x406D1388; static const DWORD MS_VC_EXCEPTION = 0x406D1388;
#pragma pack(push, 8) #pragma pack(push, 8)
@ -75,7 +58,7 @@ void SetCurrentThreadName(const char* szThreadName) {
#pragma pack(pop) #pragma pack(pop)
info.dwType = 0x1000; info.dwType = 0x1000;
info.szName = szThreadName; info.szName = name;
info.dwThreadID = -1; // dwThreadID; info.dwThreadID = -1; // dwThreadID;
info.dwFlags = 0; info.dwFlags = 0;
@ -107,10 +90,6 @@ void SetCurrentThreadAffinity(u32 mask) {
} }
#ifndef _WIN32 #ifndef _WIN32
void SleepCurrentThread(int ms) {
usleep(1000 * ms);
}
void SwitchCurrentThread() { void SwitchCurrentThread() {
usleep(1000 * 1); usleep(1000 * 1);
} }
@ -118,15 +97,15 @@ void SwitchCurrentThread() {
// MinGW with the POSIX threading model does not support pthread_setname_np // MinGW with the POSIX threading model does not support pthread_setname_np
#if !defined(_WIN32) || defined(_MSC_VER) #if !defined(_WIN32) || defined(_MSC_VER)
void SetCurrentThreadName(const char* szThreadName) { void SetCurrentThreadName(const char* name) {
#ifdef __APPLE__ #ifdef __APPLE__
pthread_setname_np(szThreadName); pthread_setname_np(name);
#elif defined(__Bitrig__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__) #elif defined(__Bitrig__) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__OpenBSD__)
pthread_set_name_np(pthread_self(), szThreadName); pthread_set_name_np(pthread_self(), name);
#elif defined(__NetBSD__) #elif defined(__NetBSD__)
pthread_setname_np(pthread_self(), "%s", (void*)szThreadName); pthread_setname_np(pthread_self(), "%s", (void*)name);
#else #else
pthread_setname_np(pthread_self(), szThreadName); pthread_setname_np(pthread_self(), name);
#endif #endif
} }
#endif #endif

20
src/common/thread.h
View File

@ -13,15 +13,8 @@
namespace Common { namespace Common {
int CurrentThreadId();
void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
void SetCurrentThreadAffinity(u32 mask);
class Event { class Event {
public: public:
Event() : is_set(false) {}
void Set() { void Set() {
std::lock_guard<std::mutex> lk(mutex); std::lock_guard<std::mutex> lk(mutex);
if (!is_set) { if (!is_set) {
@ -62,14 +55,14 @@ public:
} }
private: private:
bool is_set; bool is_set = false;
std::condition_variable condvar; std::condition_variable condvar;
std::mutex mutex; std::mutex mutex;
}; };
class Barrier { class Barrier {
public: public:
explicit Barrier(std::size_t count_) : count(count_), waiting(0), generation(0) {} explicit Barrier(std::size_t count_) : count(count_) {}
/// Blocks until all "count" threads have called Sync() /// Blocks until all "count" threads have called Sync()
void Sync() { void Sync() {
@ -89,12 +82,13 @@ public:
private: private:
std::condition_variable condvar; std::condition_variable condvar;
std::mutex mutex; std::mutex mutex;
const std::size_t count; std::size_t count;
std::size_t waiting; std::size_t waiting = 0;
std::size_t generation; // Incremented once each time the barrier is used std::size_t generation = 0; // Incremented once each time the barrier is used
}; };
void SleepCurrentThread(int ms); void SetThreadAffinity(std::thread::native_handle_type thread, u32 mask);
void SetCurrentThreadAffinity(u32 mask);
void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms void SwitchCurrentThread(); // On Linux, this is equal to sleep 1ms
void SetCurrentThreadName(const char* name); void SetCurrentThreadName(const char* name);