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

55
dep/ACE_wrappers/ace/POSIX_Proactor.cpp
View file

@ -1,4 +1,4 @@
// $Id: POSIX_Proactor.cpp 81697 2008-05-14 18:33:11Z johnnyw $
// $Id: POSIX_Proactor.cpp 86102 2009-07-18 04:15:48Z wotte $
#include "ace/POSIX_Proactor.h"
@ -685,9 +685,9 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
0) // Proactor
== -1)
ACE_ERROR ((LM_ERROR,
"%N:%l:%p\n",
"ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:"
"Open on Read Stream failed"));
ACE_TEXT("%N:%l:%p\n"),
ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:")
ACE_TEXT("Open on Read Stream failed")));
// Issue an asynch_read on the read_stream of the notify pipe.
if (this->read_stream_.read (this->message_block_,
@ -696,9 +696,9 @@ ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager (ACE_POSIX_AIOCB_Pr
0) // Priority
== -1)
ACE_ERROR ((LM_ERROR,
"%N:%l:%p\n",
"ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:"
"Read from pipe failed"));
ACE_TEXT("%N:%l:%p\n"),
ACE_TEXT("ACE_AIOCB_Notify_Pipe_Manager::ACE_AIOCB_Notify_Pipe_Manager:")
ACE_TEXT("Read from pipe failed")));
}
ACE_AIOCB_Notify_Pipe_Manager::~ACE_AIOCB_Notify_Pipe_Manager (void)
@ -1126,8 +1126,8 @@ ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result (void)
// don't waste time if queue is empty - it is normal
// or check queue size before dequeue_head
// ACE_ERROR_RETURN ((LM_ERROR,
// "%N:%l:(%P | %t):%p\n",
// "ACE_POSIX_AIOCB_Proactor::getq_result failed"),
// ACE_TEXT("%N:%l:(%P | %t):%p\n"),
// ACE_TEXT("ACE_POSIX_AIOCB_Proactor::getq_result failed")),
// 0);
return result;
@ -1239,11 +1239,14 @@ ACE_POSIX_AIOCB_Proactor::get_result_status (ACE_POSIX_Asynch_Result *asynch_res
transfer_count = 0;
// Get the error status of the aio_ operation.
error_status = aio_error (asynch_result);
// The following aio_ptr anathema is required to work around a bug in an over-aggressive
// optimizer in GCC 4.1.2.
aiocb *aio_ptr (asynch_result);
error_status = aio_error (aio_ptr);
if (error_status == EINPROGRESS)
return 0; // not completed
ssize_t op_return = aio_return (asynch_result);
ssize_t op_return = aio_return (aio_ptr);
if (op_return > 0)
transfer_count = static_cast<size_t> (op_return);
// else transfer_count is already 0, error_status reports the error.
@ -1425,16 +1428,18 @@ ACE_POSIX_AIOCB_Proactor::start_aio_i (ACE_POSIX_Asynch_Result *result)
const ACE_TCHAR *ptype = 0;
// Start IO
// The following aio_ptr anathema is required to work around a bug in
// the optimizer for GCC 4.1.2
aiocb * aio_ptr (result);
switch (result->aio_lio_opcode )
{
case LIO_READ :
ptype = ACE_TEXT ("read ");
ret_val = aio_read (result);
ret_val = aio_read (aio_ptr);
break;
case LIO_WRITE :
ptype = ACE_TEXT ("write");
ret_val = aio_write (result);
ret_val = aio_write (aio_ptr);
break;
default:
ptype = ACE_TEXT ("?????");
@ -1656,8 +1661,8 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set,
// Empty the signal set first.
if (sigemptyset (&this->RT_completion_signals_) == -1)
ACE_ERROR ((LM_ERROR,
"Error:(%P | %t):%p\n",
"sigemptyset failed"));
ACE_TEXT("Error:(%P | %t):%p\n"),
ACE_TEXT("sigemptyset failed")));
// For each signal number present in the <signal_set>, add it to
// the signal set we use, and also set up its process signal action
@ -1669,9 +1674,9 @@ ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor (const sigset_t signal_set,
si);
if (member == -1)
ACE_ERROR ((LM_ERROR,
"%N:%l:(%P | %t)::%p\n",
"ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:"
"sigismember failed"));
ACE_TEXT("%N:%l:(%P | %t)::%p\n"),
ACE_TEXT("ACE_POSIX_SIG_Proactor::ACE_POSIX_SIG_Proactor:")
ACE_TEXT("sigismember failed")));
else if (member == 1)
{
sigaddset (&this->RT_completion_signals_, si);
@ -1724,8 +1729,8 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num)
pid_t const pid = ACE_OS::getpid ();
if (pid == (pid_t) -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Error:%N:%l(%P | %t):%p",
"<getpid> failed"),
ACE_TEXT("Error:%N:%l(%P | %t):%p"),
ACE_TEXT("<getpid> failed")),
-1);
// Set the signal information.
@ -1742,8 +1747,8 @@ ACE_POSIX_SIG_Proactor::notify_completion (int sig_num)
if (errno != EAGAIN)
ACE_ERROR_RETURN ((LM_ERROR,
"Error:%N:%l:(%P | %t):%p\n",
"<sigqueue> failed"),
ACE_TEXT("Error:%N:%l:(%P | %t):%p\n"),
ACE_TEXT("<sigqueue> failed")),
-1);
return -1;
}
@ -1834,8 +1839,8 @@ ACE_POSIX_SIG_Proactor::setup_signal_handler (int signal_number) const
0);
if (sigaction_return == -1)
ACE_ERROR_RETURN ((LM_ERROR,
"Error:%p\n",
"Proactor couldnt do sigaction for the RT SIGNAL"),
ACE_TEXT("Error:%p\n"),
ACE_TEXT("Proactor couldnt do sigaction for the RT SIGNAL")),
-1);
#else
ACE_UNUSED_ARG(signal_number);