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

[10874] Update ACE to v5.8.3

Browse source 
(based on zergtmn's repo commit 3a8c259)
(based on zergtmn's repo commit 946c1a8)

Signed-off-by: VladimirMangos <vladimir@getmangos.com>
This commit is contained in:
zerg 2010-12-14 17:14:34 +03:00 • committed by VladimirMangos
parent c38c876b1d
commit b8d773091a
343 changed files with 3060 additions and 7431 deletions
Download patch file Download diff file Expand all files Collapse all files

14
dep/ACE_wrappers/ace/Timer_Queue_Adapters.cpp
View file

@ -1,4 +1,4 @@
// $Id: Timer_Queue_Adapters.cpp 89482 2010-03-15 07:58:50Z johnnyw $
// $Id: Timer_Queue_Adapters.cpp 92285 2010-10-20 16:34:57Z shuston $
#ifndef ACE_TIMER_QUEUE_ADAPTERS_CPP
#define ACE_TIMER_QUEUE_ADAPTERS_CPP
@ -17,6 +17,7 @@
# include "ace/Timer_Queue_Adapters.inl"
# endif /* __ACE_INLINE__ */
#include "ace/Reverse_Lock_T.h"
#include "ace/Signal.h"
#include "ace/OS_NS_unistd.h"
#include "ace/OS_NS_sys_time.h"
@ -278,8 +279,15 @@ ACE_Thread_Timer_Queue_Adapter<TQ, TYPE>::svc (void)
}
}
// Expire timers anyway, at worst this is a no-op.
this->timer_queue_->expire ();
// Expire timers anyway, at worst this is a no-op. Release the lock
// while dispatching; the timer queue has its own lock to protect
// itself.
{
ACE_Reverse_Lock<ACE_SYNCH_RECURSIVE_MUTEX> rel (this->mutex_);
ACE_GUARD_RETURN (ACE_Reverse_Lock<ACE_SYNCH_RECURSIVE_MUTEX>,
rmon, rel, -1);
this->timer_queue_->expire ();
}
}
// Thread cancellation point, if ACE supports it.