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

[10643] Update the ACE part we use to 5.8.2

Browse source 
Signed-off-by: Neo2003 <Neo.2003@Hotmail.fr>
This commit is contained in:
Neo2003 2010-10-25 20:36:51 +02:00
parent 8f71d95c0d
commit 23c920ca4b
739 changed files with 22031 additions and 40373 deletions
Download patch file Download diff file Expand all files Collapse all files

34
dep/ACE_wrappers/ace/Sig_Handler.cpp
View file

@ -1,4 +1,4 @@
// $Id: Sig_Handler.cpp 81388 2008-04-23 14:02:05Z johnnyw $
// $Id: Sig_Handler.cpp 91286 2010-08-05 09:04:31Z johnnyw $
#include "ace/Sig_Handler.h"
#include "ace/Sig_Adapter.h"
@ -12,7 +12,7 @@
#include "ace/Sig_Handler.inl"
#endif /* __ACE_INLINE__ */
ACE_RCSID(ace, Sig_Handler, "$Id: Sig_Handler.cpp 81388 2008-04-23 14:02:05Z johnnyw $")
#if defined (ACE_HAS_SIG_C_FUNC)
@ -148,8 +148,7 @@ ACE_Sig_Handler::register_handler_i (int signum,
if (ACE_Sig_Handler::in_range (signum))
{
ACE_Sig_Action sa; // Define a "null" action.
ACE_Event_Handler *sh = ACE_Sig_Handler::handler_i (signum,
new_sh);
ACE_Event_Handler *sh = ACE_Sig_Handler::handler_i (signum, new_sh);
// Return a pointer to the old <ACE_Sig_Handler> if the user
// asks for this.
@ -162,9 +161,9 @@ ACE_Sig_Handler::register_handler_i (int signum,
new_disp = &sa;
new_disp->handler (ace_signal_handler_dispatcher);
#if !defined (ACE_HAS_LYNXOS_SIGNALS)
#if !defined (ACE_HAS_LYNXOS4_SIGNALS)
new_disp->flags (new_disp->flags () | SA_SIGINFO);
#endif /* ACE_HAS_LYNXOS_SIGNALS */
#endif /* ACE_HAS_LYNXOS4_SIGNALS */
return new_disp->register_action (signum, old_disp);
}
else
@ -400,7 +399,10 @@ ACE_Sig_Handlers::register_handler (int signum,
// Add the ACE signal handler to the set of handlers for this
// signal (make sure it goes before the external one if there is
// one of these).
if (ACE_Sig_Handlers_Set::instance (signum)->insert (ace_sig_adapter) == -1)
int result = ACE_Sig_Handlers_Set::instance (signum)->insert (ace_sig_adapter);
if (result == -1)
{
// We couldn't reinstall our handler, so let's pretend like
// none of this happened...
@ -429,7 +431,9 @@ ACE_Sig_Handlers::register_handler (int signum,
// Default is to restart signal handlers.
new_disp->flags (new_disp->flags () | SA_RESTART);
#if !defined (ACE_HAS_LYNXOS4_SIGNALS)
new_disp->flags (new_disp->flags () | SA_SIGINFO);
#endif /* ACE_HAS_LYNXOS4_SIGNALS */
// Finally install (possibly reinstall) the ACE signal
// handler disposition with the SA_RESTART mode enabled.
@ -483,7 +487,7 @@ ACE_Sig_Handlers::remove_handler (int signum,
for (ACE_Event_Handler **eh;
handler_iterator.next (eh) != 0;
handler_iterator.advance ())
)
{
// Type-safe downcast would be nice here...
ACE_Sig_Adapter *sh = (ACE_Sig_Adapter *) *eh;
@ -551,14 +555,12 @@ ACE_Sig_Handlers::dispatch (int signum,
for (ACE_Event_Handler **eh = 0;
handler_iterator.next (eh) != 0;
handler_iterator.advance ())
{
if ((*eh)->handle_signal (signum, siginfo, ucontext) == -1)
{
handler_set->remove (*eh);
delete *eh;
}
}
)
if ((*eh)->handle_signal (signum, siginfo, ucontext) == -1)
{
handler_set->remove (*eh);
delete *eh;
}
}
// Return the first item in the list of handlers. Note that this will