josh/TCPlayerbotCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

*Backed out changeset 3be01fb200a5

Browse Source 
--HG--
branch : trunk
This commit is contained in:
maximius
2009-10-17 15:51:44 -07:00
parent 26b5e033ff
commit e585187b24
2257 changed files with 103863 additions and 761 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dep/ACE_wrappers/ace/Thread_Adapter.cpp
+34
View File
@@ -1,17 +1,22 @@
// $Id: Thread_Adapter.cpp 81239 2008-04-04 22:28:48Z iliyan $
#include "ace/Thread_Adapter.h"
#include "ace/Thread_Manager.h"
#include "ace/Thread_Exit.h"
#include "ace/Thread_Hook.h"
#include "ace/Object_Manager_Base.h"
#include "ace/Service_Config.h"
ACE_RCSID (ace,
Thread_Adapter,
"$Id: Thread_Adapter.cpp 81239 2008-04-04 22:28:48Z iliyan $")
#if !defined (ACE_HAS_INLINED_OSCALLS)
# include "ace/Thread_Adapter.inl"
#endif /* ACE_HAS_INLINED_OSCALLS */
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
void *arg,
ACE_THR_C_FUNC entry_point,
@@ -36,16 +41,20 @@ ACE_Thread_Adapter::ACE_Thread_Adapter (ACE_THR_FUNC user_func,
{
ACE_OS_TRACE ("ACE_Thread_Adapter::ACE_Thread_Adapter");
}
ACE_Thread_Adapter::~ACE_Thread_Adapter (void)
{
}
ACE_THR_FUNC_RETURN
ACE_Thread_Adapter::invoke (void)
{
// Inherit the logging features if the parent thread has an
// ACE_Log_Msg instance in thread-specific storage.
this->inherit_log_msg ();
ACE_Service_Config::current (ACE_Service_Config::global());
#if !defined(ACE_USE_THREAD_MANAGER_ADAPTER)
// NOTE: this preprocessor directive should match the one in above
// ACE_Thread_Exit::instance (). With the Xavier Pthreads package,
@@ -56,14 +65,17 @@ ACE_Thread_Adapter::invoke (void)
// how to clean us up! Note that we never use this pointer directly
// (it's stored in thread-specific storage), so it's ok to
// dereference it here and only store it as a reference.
// Except if it is null, then the thr_mgr() method crashes.
// -jxh
ACE_Thread_Exit *exit_hook_instance = ACE_Thread_Exit::instance ();
ACE_Thread_Exit_Maybe exit_hook_maybe (exit_hook_instance == 0);
ACE_Thread_Exit *exit_hook_ptr = exit_hook_instance
? exit_hook_instance
: exit_hook_maybe.instance ();
ACE_Thread_Exit &exit_hook = *exit_hook_ptr;
if (this->thr_mgr () != 0)
{
// Keep track of the <Thread_Manager> that's associated with this
@@ -80,21 +92,27 @@ ACE_Thread_Adapter::invoke (void)
ACE_Thread_Exit exit_hook;
exit_hook.thr_mgr (this->thr_mgr ());
# endif /* ACE_HAS_THREAD_SPECIFIC_STORAGE || ACE_HAS_TSS_EMULATION */
#endif /* ! ACE_USE_THREAD_MANAGER_ADAPTER */
return this->invoke_i ();
}
ACE_THR_FUNC_RETURN
ACE_Thread_Adapter::invoke_i (void)
{
// Extract the arguments.
ACE_THR_FUNC func = reinterpret_cast<ACE_THR_FUNC> (this->user_func_);
void *arg = this->arg_;
#if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0)
ACE_OS_Thread_Descriptor *thr_desc = this->thr_desc_;
#endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */
// Delete ourselves since we don't need <this> anymore. Make sure
// not to access <this> anywhere below this point.
delete this;
#if defined (ACE_NEEDS_LWP_PRIO_SET)
// On SunOS, the LWP priority needs to be set in order to get
// preemption when running in the RT class. This is the ACE way to
@@ -102,19 +120,25 @@ ACE_Thread_Adapter::invoke_i (void)
ACE_hthread_t thr_handle;
ACE_OS::thr_self (thr_handle);
int prio;
// thr_getprio () on the current thread should never fail.
ACE_OS::thr_getprio (thr_handle, prio);
// ACE_OS::thr_setprio () has the special logic to set the LWP priority,
// if running in the RT class.
ACE_OS::thr_setprio (prio);
#endif /* ACE_NEEDS_LWP_PRIO_SET */
ACE_THR_FUNC_RETURN status = 0;
ACE_SEH_TRY
{
ACE_SEH_TRY
{
ACE_Thread_Hook *hook =
ACE_OS_Object_Manager::thread_hook ();
if (hook)
// Invoke the start hook to give the user a chance to
// perform some initialization processing before the
@@ -124,6 +148,7 @@ ACE_Thread_Adapter::invoke_i (void)
// Call thread entry point.
status = (*func) (arg);
}
#if defined (ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS)
ACE_SEH_EXCEPT (ACE_OS_Object_Manager::seh_except_selector ()(
(void *) GetExceptionInformation ()))
@@ -132,6 +157,7 @@ ACE_Thread_Adapter::invoke_i (void)
}
#endif /* ACE_HAS_WIN32_STRUCTURAL_EXCEPTIONS */
}
ACE_SEH_FINALLY
{
// If we changed this to 1, change the respective if in
@@ -143,13 +169,16 @@ ACE_Thread_Adapter::invoke_i (void)
{
ACE_Task_Base *task_ptr = (ACE_Task_Base *) arg;
ACE_Thread_Manager *thr_mgr_ptr = task_ptr->thr_mgr ();
// This calls the Task->close () hook.
task_ptr->cleanup (task_ptr, 0);
// This prevents a second invocation of the cleanup code
// (called later by <ACE_Thread_Manager::exit>.
thr_mgr_ptr->at_exit (task_ptr, 0, 0);
}
#endif /* 0 */
#if defined (ACE_WIN32) || defined (ACE_HAS_TSS_EMULATION)
# if defined (ACE_WIN32) && defined (ACE_HAS_MFC) && (ACE_HAS_MFC != 0)
int using_afx = -1;
@@ -158,6 +187,7 @@ ACE_Thread_Adapter::invoke_i (void)
# endif /* ACE_WIN32 && ACE_HAS_MFC && (ACE_HAS_MFC != 0) */
// Call TSS destructors.
ACE_OS::cleanup_tss (0 /* not main thread */);
# if defined (ACE_WIN32)
// Exit the thread. Allow CWinThread-destructor to be invoked
// from AfxEndThread. _endthreadex will be called from
@@ -178,18 +208,22 @@ ACE_Thread_Adapter::invoke_i (void)
// ACE_Thread_Manager to spawn threads. The following code
// is know to cause some problem.
CWinThread *pThread = ::AfxGetThread ();
if (!pThread || pThread->m_nThreadID != ACE_OS::thr_self ())
ACE_ENDTHREADEX (status);
else
::AfxEndThread ((DWORD)status);
}
# else
ACE_ENDTHREADEX (status);
# endif /* ACE_HAS_MFC && ACE_HAS_MFS != 0*/
# endif /* ACE_WIN32 */
#endif /* ACE_WIN32 || ACE_HAS_TSS_EMULATION */
}
return status;
}
ACE_END_VERSIONED_NAMESPACE_DECL