ShuriZma
/
xenia
mirror of https://github.com/xenia-project/xenia.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Use TLS to store the current thread.

This commit is contained in:
Dr. Chat 2015-12-02 20:11:19 -06:00 committed by Ben Vanik
parent 7e88e54cbe
commit 3678a22c90
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/xenia/base/threading.h
View File

@ -345,7 +345,7 @@ class Thread : public WaitHandle {
// within that thread. // within that thread.
static std::unique_ptr<Thread> Create(CreationParameters params, static std::unique_ptr<Thread> Create(CreationParameters params,
std::function<void()> start_routine); std::function<void()> start_routine);
static std::unique_ptr<Thread> GetCurrentThread(); static Thread* GetCurrentThread();
// Ends the calling thread. // Ends the calling thread.
// No destructors are called, and this function does not return. // No destructors are called, and this function does not return.

15
src/xenia/base/threading_win.cc
View File

@ -426,10 +426,14 @@ class Win32Thread : public Win32Handle<Thread> {
} }
}; };
thread_local std::unique_ptr<Win32Thread> current_thread_ = nullptr;
struct ThreadStartData { struct ThreadStartData {
std::function<void()> start_routine; std::function<void()> start_routine;
}; };
DWORD WINAPI ThreadStartRoutine(LPVOID parameter) { DWORD WINAPI ThreadStartRoutine(LPVOID parameter) {
current_thread_ = std::make_unique<Win32Thread>(::GetCurrentThread());
auto start_data = reinterpret_cast<ThreadStartData*>(parameter); auto start_data = reinterpret_cast<ThreadStartData*>(parameter);
start_data->start_routine(); start_data->start_routine();
delete start_data; delete start_data;
@ -449,17 +453,22 @@ std::unique_ptr<Thread> Thread::Create(CreationParameters params,
delete start_data; delete start_data;
return nullptr; return nullptr;
} }
GetThreadId(handle);
return std::make_unique<Win32Thread>(handle); return std::make_unique<Win32Thread>(handle);
} }
std::unique_ptr<Thread> Thread::GetCurrentThread() { Thread* Thread::GetCurrentThread() {
if (current_thread_) {
return current_thread_.get();
}
HANDLE handle = ::GetCurrentThread(); HANDLE handle = ::GetCurrentThread();
if (handle == INVALID_HANDLE_VALUE) { if (handle == INVALID_HANDLE_VALUE) {
return nullptr; return nullptr;
} }
return std::make_unique<Win32Thread>(handle); current_thread_ = std::make_unique<Win32Thread>(handle);
return current_thread_.get();
} }
void Thread::Exit(int exit_code) { ExitThread(exit_code); } void Thread::Exit(int exit_code) { ExitThread(exit_code); }