mangos-mirror/server
0
0
Fork 0
mirror of https://github.com/mangosfour/server.git synced 2025-12-12 01:37:00 +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

63
dep/acelite/ace/Sig_Handler.cpp
View file

@ -1,4 +1,4 @@
// $Id: Sig_Handler.cpp 91626 2010-09-07 10:59:20Z johnnyw $
// $Id: Sig_Handler.cpp 97246 2013-08-07 07:10:20Z johnnyw $
#include "ace/Sig_Handler.h"
#include "ace/Sig_Adapter.h"
@ -54,6 +54,9 @@ ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handler)
ACE_Sig_Handler::~ACE_Sig_Handler (void)
{
for (int s = 1; s < ACE_NSIG; ++s)
if (ACE_Sig_Handler::signal_handlers_[s])
ACE_Sig_Handler::remove_handler_i (s);
}
void
@ -194,6 +197,33 @@ ACE_Sig_Handler::register_handler (int signum,
old_disp);
}
int
ACE_Sig_Handler::remove_handler_i (int signum,
ACE_Sig_Action *new_disp,
ACE_Sig_Action *old_disp,
int)
{
ACE_TRACE ("ACE_Sig_Handler::remove_handler_i");
ACE_Sig_Action sa (SIG_DFL, (sigset_t *) 0); // Reset to default disposition.
if (new_disp == 0)
new_disp = &sa;
ACE_Event_Handler *eh = ACE_Sig_Handler::signal_handlers_[signum];
ACE_Sig_Handler::signal_handlers_[signum] = 0;
// Allow the event handler to close down if necessary.
if (eh)
{
eh->handle_close (ACE_INVALID_HANDLE,
ACE_Event_Handler::SIGNAL_MASK);
}
// Register either the new disposition or restore the default.
return new_disp->register_action (signum, old_disp);
}
// Remove an ACE_Event_Handler.
int
@ -209,17 +239,7 @@ ACE_Sig_Handler::remove_handler (int signum,
ACE_GUARD_RETURN (ACE_Recursive_Thread_Mutex, m, *lock, -1));
if (ACE_Sig_Handler::in_range (signum))
{
ACE_Sig_Action sa (SIG_DFL, (sigset_t *) 0); // Define the default disposition.
if (new_disp == 0)
new_disp = &sa;
ACE_Sig_Handler::signal_handlers_[signum] = 0;
// Register either the new disposition or restore the default.
return new_disp->register_action (signum, old_disp);
}
return ACE_Sig_Handler::remove_handler_i (signum, new_disp, old_disp);
return -1;
}
@ -249,20 +269,7 @@ ACE_Sig_Handler::dispatch (int signum,
if (eh != 0)
{
if (eh->handle_signal (signum, siginfo, ucontext) == -1)
{
// Define the default disposition.
ACE_Sig_Action sa ((ACE_SignalHandler) SIG_DFL, (sigset_t *) 0);
ACE_Sig_Handler::signal_handlers_[signum] = 0;
// Remove the current disposition by registering the default
// disposition.
sa.register_action (signum);
// Allow the event handler to close down if necessary.
eh->handle_close (ACE_INVALID_HANDLE,
ACE_Event_Handler::SIGNAL_MASK);
}
ACE_Sig_Handler::remove_handler_i (signum);
#if defined (ACE_WIN32)
else
// Win32 is weird in the sense that it resets the signal
@ -322,6 +329,10 @@ ACE_Sig_Handlers_Set::instance (int signum)
ACE_ALLOC_HOOK_DEFINE(ACE_Sig_Handlers)
ACE_Sig_Handlers::ACE_Sig_Handlers (void)
{
}
void
ACE_Sig_Handlers::dump (void) const
{