mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-17 07:37:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[8328] Fixed problem with crash at startup in result destroy anti-freeze thread runnable.

Browse source 
* Destroy runnable only if no references.
* Some code cleanups
This commit is contained in:
VladimirMangos 2009-08-08 09:35:59 +04:00
parent 79c1324bed
commit 7baebcd2de
5 changed files with 50 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/shared/Threading.cpp
View file

@ -103,6 +103,10 @@ Thread::Thread() : m_task(0), m_iThreadId(0), m_hThreadHandle(0)
Thread::Thread(Runnable* instance) : m_task(instance), m_iThreadId(0), m_hThreadHandle(0)
{
// register reference to m_task to prevent it deeltion until destructor
if (m_task)
m_task->incReference();
bool _start = start();
ASSERT (_start);
}
@ -111,8 +115,9 @@ Thread::~Thread()
{
//Wait();
// deleted runnable object (owned by Thread)
delete m_task;
// deleted runnable object (if no other references)
if (m_task)
m_task->decReference();
}
//initialize Thread's class static member
@ -121,15 +126,20 @@ ThreadPriority Thread::m_TpEnum;
bool Thread::start()
{
if(m_task == 0 || m_iThreadId != 0)
if (m_task == 0 || m_iThreadId != 0)
return false;
return (ACE_Thread::spawn(&Thread::ThreadTask, (void*)m_task, THREADFLAG, &m_iThreadId, &m_hThreadHandle) == 0);
bool res = (ACE_Thread::spawn(&Thread::ThreadTask, (void*)m_task, THREADFLAG, &m_iThreadId, &m_hThreadHandle) == 0);
if (res)
m_task->incReference();
return res;
}
bool Thread::wait()
{
if(!m_hThreadHandle || !m_task)
if (!m_hThreadHandle || !m_task)
return false;
ACE_THR_FUNC_RETURN _value = ACE_THR_FUNC_RETURN(-1);
@ -143,7 +153,17 @@ bool Thread::wait()
void Thread::destroy()
{
ACE_Thread::kill(m_iThreadId, -1);
if (!m_iThreadId || !m_task)
return;
if (ACE_Thread::kill(m_iThreadId, -1) != 0)
return;
m_iThreadId = 0;
m_hThreadHandle = 0;
// reference set at ACE_Thread::spawn
m_task->decReference();
}
void Thread::suspend()
@ -161,6 +181,9 @@ ACE_THR_FUNC_RETURN Thread::ThreadTask(void * param)
Runnable * _task = (Runnable*)param;
_task->run();
// task execution complete, free referecne added at
_task->decReference();
return (ACE_THR_FUNC_RETURN)0;
}