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

[Common] Keep better track of the thread id

This commit is contained in:
zilmar 2016-06-16 21:13:29 +10:00
parent 6093ed6a41
commit 7ded72f6ee
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/Common/Thread.cpp
View File

@ -8,10 +8,12 @@
CThread::CThread(CTHREAD_START_ROUTINE lpStartAddress) : CThread::CThread(CTHREAD_START_ROUTINE lpStartAddress) :
m_StartAddress(lpStartAddress), m_StartAddress(lpStartAddress),
m_lpThreadParameter(NULL),
m_thread(NULL),
#ifndef _WIN32 #ifndef _WIN32
m_running(false), m_running(false),
#endif #endif
m_thread(NULL) m_threadID(0)
{ {
WriteTrace(TraceThread, TraceDebug, "Start"); WriteTrace(TraceThread, TraceDebug, "Start");
WriteTrace(TraceThread, TraceDebug, "Done"); WriteTrace(TraceThread, TraceDebug, "Done");
@ -20,7 +22,7 @@ CThread::CThread(CTHREAD_START_ROUTINE lpStartAddress) :
CThread::~CThread() CThread::~CThread()
{ {
WriteTrace(TraceThread, TraceDebug, "Start"); WriteTrace(TraceThread, TraceDebug, "Start");
if (isRunning()) if (CThread::GetCurrentThreadId() != m_threadID && isRunning())
{ {
Terminate(); Terminate();
} }
@ -50,6 +52,7 @@ bool CThread::Start(void * lpThreadParameter)
void * CThread::ThreadWrapper (CThread * _this) void * CThread::ThreadWrapper (CThread * _this)
{ {
WriteTrace(TraceThread, TraceDebug, "Start"); WriteTrace(TraceThread, TraceDebug, "Start");
_this->m_threadID = CThread::GetCurrentThreadId();
#ifndef _WIN32 #ifndef _WIN32
_this->m_running = true; _this->m_running = true;
WriteTrace(TraceThread, TraceDebug, "Thread is running"); WriteTrace(TraceThread, TraceDebug, "Thread is running");