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

Some missing from merge.

Browse source 
Signed-off-by: Salja <salja2012@hotmail.de>
This commit is contained in:
Salja 2012-08-05 14:54:07 +02:00 • committed by Antz
parent ec939a5bce
commit f4be15a7af
1895 changed files with 160408 additions and 53601 deletions
Download patch file Download diff file Expand all files Collapse all files

35
dep/acelite/ace/Dev_Poll_Reactor.cpp
View file

@ -1,3 +1,5 @@
// $Id: Dev_Poll_Reactor.cpp 97894 2014-09-16 18:11:56Z johnnyw $
#include "ace/OS_NS_errno.h"
#include "ace/Dev_Poll_Reactor.h"
#include "ace/Signal.h"
@ -42,10 +44,6 @@
ACE_BEGIN_VERSIONED_NAMESPACE_DECL
ACE_ALLOC_HOOK_DEFINE(ACE_Dev_Poll_Reactor)
ACE_ALLOC_HOOK_DEFINE(ACE_Dev_Poll_Reactor::Event_Tuple)
ACE_ALLOC_HOOK_DEFINE(ACE_Dev_Poll_Reactor_Notify)
ACE_Dev_Poll_Reactor_Notify::ACE_Dev_Poll_Reactor_Notify (void)
: dp_reactor_ (0)
, notification_pipe_ ()
@ -76,16 +74,10 @@ ACE_Dev_Poll_Reactor_Notify::open (ACE_Reactor_Impl *r,
if (this->notification_pipe_.open () == -1)
return -1;
#if defined (F_SETFD) && !defined (ACE_LACKS_FCNTL)
#if defined (F_SETFD)
// close-on-exec
if (ACE_OS::fcntl (this->notification_pipe_.read_handle (), F_SETFD, 1) == -1)
{
return -1;
}
if (ACE_OS::fcntl (this->notification_pipe_.write_handle (), F_SETFD, 1) == -1)
{
return -1;
}
ACE_OS::fcntl (this->notification_pipe_.read_handle (), F_SETFD, 1);
ACE_OS::fcntl (this->notification_pipe_.write_handle (), F_SETFD, 1);
#endif /* F_SETFD */
#if defined (ACE_HAS_REACTOR_NOTIFICATION_QUEUE)
@ -1330,22 +1322,7 @@ ACE_Dev_Poll_Reactor::dispatch_io_event (Token_Guard &guard)
if (info != 0 && info->event_handler == eh)
{
if (status < 0)
{
this->remove_handler_i (handle, disp_mask, grd);
#ifdef ACE_HAS_EVENT_POLL
// epoll-based effectively suspends handlers around the upcall.
// If the handler must be resumed, check to be sure it's the
// same handle/handler combination still.
if (reactor_resumes_eh)
{
info = this->handler_rep_.find (handle);
if (info != 0 && info->event_handler == eh)
{
this->resume_handler_i (handle);
}
}
#endif /* ACE_HAS_EVENT_POLL */
}
this->remove_handler_i (handle, disp_mask, grd);
}
}
// Scope close handles eh ref count decrement, if needed.