archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-03 13:31:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Defined thread_local for MSVC

Browse source 
Updated asmjit project
Tried to fix crash on exit
Fixed hypothetical issue when pausing already stopped emulator
This commit is contained in:
Nekotekina 2014-06-19 17:50:18 +04:00
parent bf6507e9be
commit ccfaabd1d7
12 changed files with 62 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Utilities/Thread.cpp
View file

@ -3,14 +3,8 @@
#include "Thread.h"
#ifdef _WIN32
__declspec(thread)
#elif __APPLE__
__thread
#else
thread_local
#endif
NamedThreadBase* g_tls_this_thread = nullptr;
thread_local NamedThreadBase* g_tls_this_thread = nullptr;
std::atomic<u32> g_thread_count = 0;
NamedThreadBase* GetCurrentNamedThread()
{
@ -56,10 +50,12 @@ void ThreadBase::Start()
[this]()
{
g_tls_this_thread = this;
g_thread_count++;
Task();
m_alive = false;
g_thread_count--;
});
}
@ -130,6 +126,7 @@ void thread::start(std::function<void()> func)
{
NamedThreadBase info(name);
g_tls_this_thread = &info;
g_thread_count++;
try
{
@ -140,6 +137,8 @@ void thread::start(std::function<void()> func)
ConLog.Error("Crash :(");
//std::terminate();
}
g_thread_count--;
});
}