diff options
Diffstat (limited to 'ace/POSIX_Asynch_IO.cpp')
| -rw-r--r-- | ace/POSIX_Asynch_IO.cpp | 107 |
1 files changed, 76 insertions, 31 deletions
diff --git a/ace/POSIX_Asynch_IO.cpp b/ace/POSIX_Asynch_IO.cpp index c0ab5c0052f..9013b577e33 100644 --- a/ace/POSIX_Asynch_IO.cpp +++ b/ace/POSIX_Asynch_IO.cpp @@ -19,8 +19,6 @@ ACE_RCSID (ace, "$Id$") -ACE_BEGIN_VERSIONED_NAMESPACE_DECL - size_t ACE_POSIX_Asynch_Result::bytes_transferred (void) const { @@ -120,7 +118,9 @@ ACE_POSIX_Asynch_Result::ACE_POSIX_Asynch_Result u_long offset_high, int priority, int signal_number) - : handler_proxy_ (handler_proxy), + : ACE_Asynch_Result_Impl (), + aiocb (), + handler_proxy_ (handler_proxy), act_ (act), bytes_transferred_ (0), success_ (0), @@ -206,7 +206,8 @@ ACE_POSIX_Asynch_Operation::~ACE_POSIX_Asynch_Operation (void) } ACE_POSIX_Asynch_Operation::ACE_POSIX_Asynch_Operation (ACE_POSIX_Proactor *posix_proactor) - : posix_proactor_ (posix_proactor), + : ACE_Asynch_Operation_Impl (), + posix_proactor_ (posix_proactor), handle_ (ACE_INVALID_HANDLE) { } @@ -240,7 +241,9 @@ ACE_POSIX_Asynch_Read_Stream_Result::ACE_POSIX_Asynch_Read_Stream_Result ACE_HANDLE event, int priority, int signal_number) - : ACE_POSIX_Asynch_Result + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Read_Stream_Result_Impl (), + ACE_POSIX_Asynch_Result (handler_proxy, act, event, 0, 0, priority, signal_number), message_block_ (message_block) { @@ -282,7 +285,9 @@ ACE_POSIX_Asynch_Read_Stream_Result::~ACE_POSIX_Asynch_Read_Stream_Result (void) // ************************************************************ ACE_POSIX_Asynch_Read_Stream::ACE_POSIX_Asynch_Read_Stream (ACE_POSIX_Proactor *posix_proactor) - : ACE_POSIX_Asynch_Operation (posix_proactor) + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Read_Stream_Impl (), + ACE_POSIX_Asynch_Operation (posix_proactor) { } @@ -317,7 +322,7 @@ ACE_POSIX_Asynch_Read_Stream::read (ACE_Message_Block &message_block, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_READ); + int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ); if (return_val == -1) delete result; @@ -357,7 +362,9 @@ ACE_POSIX_Asynch_Write_Stream_Result::ACE_POSIX_Asynch_Write_Stream_Result ACE_HANDLE event, int priority, int signal_number) - : ACE_POSIX_Asynch_Result + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Write_Stream_Result_Impl (), + ACE_POSIX_Asynch_Result (handler_proxy, act, event, 0, 0, priority, signal_number), message_block_ (message_block) { @@ -400,7 +407,9 @@ ACE_POSIX_Asynch_Write_Stream_Result::~ACE_POSIX_Asynch_Write_Stream_Result (voi // ********************************************************************* ACE_POSIX_Asynch_Write_Stream::ACE_POSIX_Asynch_Write_Stream (ACE_POSIX_Proactor *posix_proactor) - : ACE_POSIX_Asynch_Operation (posix_proactor) + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Write_Stream_Impl (), + ACE_POSIX_Asynch_Operation (posix_proactor) { } @@ -435,7 +444,7 @@ ACE_POSIX_Asynch_Write_Stream::write (ACE_Message_Block &message_block, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_WRITE); + int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE); if (return_val == -1) delete result; @@ -459,7 +468,10 @@ ACE_POSIX_Asynch_Read_File_Result::ACE_POSIX_Asynch_Read_File_Result ACE_HANDLE event, int priority, int signal_number) - : ACE_POSIX_Asynch_Read_Stream_Result (handler_proxy, + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Read_Stream_Result_Impl (), + ACE_Asynch_Read_File_Result_Impl (), + ACE_POSIX_Asynch_Read_Stream_Result (handler_proxy, handle, message_block, bytes_to_read, @@ -509,7 +521,10 @@ ACE_POSIX_Asynch_Read_File_Result::~ACE_POSIX_Asynch_Read_File_Result (void) // ********************************************************************* ACE_POSIX_Asynch_Read_File::ACE_POSIX_Asynch_Read_File (ACE_POSIX_Proactor *posix_proactor) - : ACE_POSIX_Asynch_Read_Stream (posix_proactor) + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Read_Stream_Impl (), + ACE_Asynch_Read_File_Impl (), + ACE_POSIX_Asynch_Read_Stream (posix_proactor) { } @@ -548,7 +563,7 @@ ACE_POSIX_Asynch_Read_File::read (ACE_Message_Block &message_block, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_READ); + int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ); if (return_val == -1) delete result; @@ -586,7 +601,10 @@ ACE_POSIX_Asynch_Write_File_Result::ACE_POSIX_Asynch_Write_File_Result ACE_HANDLE event, int priority, int signal_number) - : ACE_POSIX_Asynch_Write_Stream_Result (handler_proxy, + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Write_Stream_Result_Impl (), + ACE_Asynch_Write_File_Result_Impl (), + ACE_POSIX_Asynch_Write_Stream_Result (handler_proxy, handle, message_block, bytes_to_write, @@ -636,7 +654,10 @@ ACE_POSIX_Asynch_Write_File_Result::~ACE_POSIX_Asynch_Write_File_Result (void) // ********************************************************************* ACE_POSIX_Asynch_Write_File::ACE_POSIX_Asynch_Write_File (ACE_POSIX_Proactor *posix_proactor) - : ACE_POSIX_Asynch_Write_Stream (posix_proactor) + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Write_Stream_Impl (), + ACE_Asynch_Write_File_Impl (), + ACE_POSIX_Asynch_Write_Stream (posix_proactor) { } @@ -675,7 +696,7 @@ ACE_POSIX_Asynch_Write_File::write (ACE_Message_Block &message_block, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_WRITE); + int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE); if (return_val == -1) delete result; @@ -738,7 +759,9 @@ ACE_POSIX_Asynch_Accept_Result::ACE_POSIX_Asynch_Accept_Result int priority, int signal_number) - : ACE_POSIX_Asynch_Result + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Accept_Result_Impl (), + ACE_POSIX_Asynch_Result (handler_proxy, act, event, 0, 0, priority, signal_number), message_block_ (message_block), listen_handle_ (listen_handle) @@ -778,7 +801,9 @@ ACE_POSIX_Asynch_Accept_Result::~ACE_POSIX_Asynch_Accept_Result (void) // ********************************************************************* ACE_POSIX_Asynch_Accept::ACE_POSIX_Asynch_Accept (ACE_POSIX_Proactor * posix_proactor) - : ACE_POSIX_Asynch_Operation (posix_proactor), + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Accept_Impl (), + ACE_POSIX_Asynch_Operation (posix_proactor), flg_open_ (false) { } @@ -1155,7 +1180,10 @@ ACE_POSIX_Asynch_Connect_Result::ACE_POSIX_Asynch_Connect_Result ACE_HANDLE event, int priority, int signal_number) - : ACE_POSIX_Asynch_Result + + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Connect_Result_Impl (), + ACE_POSIX_Asynch_Result (handler_proxy, act, event, 0, 0, priority, signal_number) { this->aio_fildes = connect_handle; @@ -1190,7 +1218,9 @@ ACE_POSIX_Asynch_Connect_Result::~ACE_POSIX_Asynch_Connect_Result (void) // ********************************************************************* ACE_POSIX_Asynch_Connect::ACE_POSIX_Asynch_Connect (ACE_POSIX_Proactor * posix_proactor) - : ACE_POSIX_Asynch_Operation (posix_proactor), + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Connect_Impl (), + ACE_POSIX_Asynch_Operation (posix_proactor), flg_open_ (false) { } @@ -1667,7 +1697,10 @@ ACE_POSIX_Asynch_Transmit_File_Result::ACE_POSIX_Asynch_Transmit_File_Result ACE_HANDLE event, int priority, int signal_number) - : ACE_POSIX_Asynch_Result + + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Transmit_File_Result_Impl (), + ACE_POSIX_Asynch_Result (handler_proxy, act, event, offset, offset_high, priority, signal_number), socket_ (socket), header_and_trailer_ (header_and_trailer), @@ -2054,7 +2087,9 @@ ACE_POSIX_Asynch_Transmit_Handler::initiate_read_file (void) // ********************************************************************* ACE_POSIX_Asynch_Transmit_File::ACE_POSIX_Asynch_Transmit_File (ACE_POSIX_Proactor *posix_proactor) - : ACE_POSIX_Asynch_Operation (posix_proactor) + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Transmit_File_Impl (), + ACE_POSIX_Asynch_Operation (posix_proactor) { } @@ -2117,8 +2152,8 @@ ACE_POSIX_Asynch_Transmit_File::transmit_file (ACE_HANDLE file, ACE_POSIX_Asynch_Transmit_Handler *transmit_handler = 0; ACE_NEW_RETURN (transmit_handler, - ACE_POSIX_Asynch_Transmit_Handler (this->posix_proactor (), - result), + ::ACE_POSIX_Asynch_Transmit_Handler (this->posix_proactor (), + result), -1); ssize_t return_val = transmit_handler->transmit (); @@ -2193,7 +2228,10 @@ ACE_POSIX_Asynch_Read_Dgram_Result::ACE_POSIX_Asynch_Read_Dgram_Result ACE_HANDLE event, int priority, int signal_number) - : ACE_POSIX_Asynch_Result + + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Read_Dgram_Result_Impl(), + ACE_POSIX_Asynch_Result (handler_proxy, act, event, 0, 0, priority, signal_number), bytes_to_read_ (bytes_to_read), message_block_ (message_block), @@ -2275,7 +2313,10 @@ ACE_POSIX_Asynch_Write_Dgram_Result::ACE_POSIX_Asynch_Write_Dgram_Result ACE_HANDLE event, int priority, int signal_number) - : ACE_POSIX_Asynch_Result + + : ACE_Asynch_Result_Impl (), + ACE_Asynch_Write_Dgram_Result_Impl(), + ACE_POSIX_Asynch_Result (handler_proxy, act, event, 0, 0, priority, signal_number), bytes_to_write_ (bytes_to_write), message_block_ (message_block), @@ -2349,7 +2390,7 @@ ACE_POSIX_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_READ); + int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::READ); if (return_val == -1) delete result; @@ -2357,7 +2398,9 @@ ACE_POSIX_Asynch_Read_Dgram::recv (ACE_Message_Block *message_block, } ACE_POSIX_Asynch_Read_Dgram::ACE_POSIX_Asynch_Read_Dgram (ACE_POSIX_Proactor *posix_proactor) - : ACE_POSIX_Asynch_Operation (posix_proactor) + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Read_Dgram_Impl (), + ACE_POSIX_Asynch_Operation (posix_proactor) { } @@ -2398,7 +2441,7 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, signal_number), -1); - int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::ACE_OPCODE_WRITE); + int return_val = proactor->start_aio (result, ACE_POSIX_Proactor::WRITE); if (return_val == -1) delete result; @@ -2407,7 +2450,9 @@ ACE_POSIX_Asynch_Write_Dgram::send (ACE_Message_Block *message_block, ACE_POSIX_Asynch_Write_Dgram::ACE_POSIX_Asynch_Write_Dgram (ACE_POSIX_Proactor *posix_proactor) - : ACE_POSIX_Asynch_Operation (posix_proactor) + : ACE_Asynch_Operation_Impl (), + ACE_Asynch_Write_Dgram_Impl (), + ACE_POSIX_Asynch_Operation (posix_proactor) { } @@ -2447,8 +2492,8 @@ template class ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Res #pragma instantiate ACE_Map_Const_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX> #pragma instantiate ACE_Map_Reverse_Iterator<ACE_HANDLE, ACE_POSIX_Asynch_Connect_Result *, ACE_SYNCH_NULL_MUTEX> + #endif /* ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION */ -ACE_END_VERSIONED_NAMESPACE_DECL #endif /* ACE_HAS_AIO_CALLS */ |