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

[Rel21] Stage 1 of updates for Rel21 Build System

Browse source
This commit is contained in:
Antz 2015-07-28 10:59:34 +01:00 • committed by Antz
parent 13292befd6
commit fdefc0869a
1951 changed files with 40474 additions and 252610 deletions
Download patch file Download diff file Expand all files Collapse all files

30
dep/acelite/ace/Thread_Manager.cpp
View file

@ -1,4 +1,4 @@
// $Id: Thread_Manager.cpp 96067 2012-08-16 13:45:10Z mcorino $
// $Id: Thread_Manager.cpp 97769 2014-06-05 06:37:53Z johnnyw $
#include "ace/TSS_T.h"
#include "ace/Thread_Manager.h"
@ -66,10 +66,10 @@ ACE_Thread_Manager::dump (void)
ACE_MT (ACE_GUARD (ACE_Thread_Mutex, ace_mon,
((ACE_Thread_Manager *) this)->lock_));
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ()));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ncurrent_count_ = %d"), this->thr_list_.size ()));
for (ACE_Double_Linked_List_Iterator<ACE_Thread_Descriptor> iter (this->thr_list_);
!iter.done ();
@ -78,7 +78,7 @@ ACE_Thread_Manager::dump (void)
iter.next ()->dump ();
}
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
@ -246,15 +246,15 @@ ACE_Thread_Descriptor::dump (void) const
{
#if defined (ACE_HAS_DUMP)
ACE_TRACE ("ACE_Thread_Descriptor::dump");
ACE_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
ACELIB_DEBUG ((LM_DEBUG, ACE_BEGIN_DUMP, this));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_id_ = %d"), this->thr_id_));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_handle_ = %d"), this->thr_handle_));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d"), this->thr_state_));
ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_id_ = %d"), this->thr_id_));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_handle_ = %d"), this->thr_handle_));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\ngrp_id_ = %d"), this->grp_id_));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nthr_state_ = %d"), this->thr_state_));
ACELIB_DEBUG ((LM_DEBUG, ACE_TEXT ("\nflags_ = %x\n"), this->flags_));
ACE_DEBUG ((LM_DEBUG, ACE_END_DUMP));
ACELIB_DEBUG ((LM_DEBUG, ACE_END_DUMP));
#endif /* ACE_HAS_DUMP */
}
@ -1447,12 +1447,12 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status)
{
if (ACE_OS::thr_equal (biter.next ()->thr_id_, tid))
{
ACE_Thread_Descriptor_Base *tdb = biter.advance_and_remove (false);
if (ACE_Thread::join (tdb->thr_handle_, status) == -1)
ACE_Thread_Descriptor_Base *tdbl = biter.advance_and_remove (false);
if (ACE_Thread::join (tdbl->thr_handle_, status) == -1)
{
return -1;
}
delete tdb;
delete tdbl;
// return immediately if we've found the thread we want to join.
return 0;