summaryrefslogtreecommitdiff
path: root/ace/Asynch_IO.cpp
diff options
context:
space:
mode:
authoralex <alex@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-08 04:45:32 +0000
committeralex <alex@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>1998-10-08 04:45:32 +0000
commit242b79765da14cd5b1c2cef962b3c9ca59c84016 (patch)
tree6e4dbec947096c11857c77d88865342d56f2ea26 /ace/Asynch_IO.cpp
parent813008f330e7eb2d97e4554dd97a9d6d0d3b1825 (diff)
downloadATCD-242b79765da14cd5b1c2cef962b3c9ca59c84016.tar.gz
Fixed the problem with doing multiple Asynch_Accepts. Thanks to James
Hu for reporting this problem. Thanks very much Irfan!!!, for helping me a lot fixing this one.
Diffstat (limited to 'ace/Asynch_IO.cpp')
-rw-r--r--ace/Asynch_IO.cpp26
1 files changed, 16 insertions, 10 deletions
diff --git a/ace/Asynch_IO.cpp b/ace/Asynch_IO.cpp
index 584730b23a5..900f3d08ac9 100644
--- a/ace/Asynch_IO.cpp
+++ b/ace/Asynch_IO.cpp
@@ -290,7 +290,8 @@ ACE_Asynch_Read_Stream::shared_read (ACE_Asynch_Read_Stream::Result *result)
if (aio_read (result->aiocb_ptr ()) == -1)
// Queueing failed.
ACE_ERROR_RETURN ((LM_ERROR,
- "Erro:%p:Asynch_Read_Stream: aio_read queueing failed\n"),
+ "Error:%p\n",
+ "Asynch_Read_Stream: aio_read queueing failed"),
-1);
}
else
@@ -338,7 +339,8 @@ ACE_Asynch_Read_Stream::shared_read (ACE_Asynch_Read_Stream::Result *result)
{
// Queueing failed.
ACE_ERROR ((LM_ERROR,
- "Error:%p:Asynch_Read_Stream: aio_read queueing failed\n"));
+ "Error:%p\n",
+ "Asynch_Read_Stream: aio_read queueing failed"));
// Clean up the memory allocated.
delete aiocb_ptr;
@@ -496,7 +498,8 @@ ACE_Asynch_Write_Stream::shared_write (ACE_Asynch_Write_Stream::Result *result)
if (aio_write (result->aiocb_ptr ()) == -1)
// Queueing failed.
ACE_ERROR_RETURN ((LM_ERROR,
- "%p:Asynch_Write_Stream: aio_write queueing failed\n"),
+ "Error:%p\n",
+ "Asynch_Write_Stream: aio_write queueing failed"),
-1);
}
else
@@ -544,7 +547,8 @@ ACE_Asynch_Write_Stream::shared_write (ACE_Asynch_Write_Stream::Result *result)
{
// Queueing failed.
ACE_ERROR ((LM_ERROR,
- "Error:%p:Asynch_Write_Stream: aio_write queueing failed\n"));
+ "Error:%p\n",
+ "Asynch_Write_Stream: aio_write queueing failed"));
// Clean up the memory allocated.
delete aiocb_ptr;
@@ -911,7 +915,7 @@ ACE_Asynch_Accept_Handler::handle_input (ACE_HANDLE fd)
ACE_HANDLE new_handle = ACE_OS::accept (result->listen_handle (), 0, 0);
if (new_handle == ACE_INVALID_HANDLE)
ACE_ERROR_RETURN ((LM_ERROR,
- "Error:(%P | %t):%p:\n",
+ "Error:(%P | %t):%p\n",
"<accept> system call failed"),
-1);
@@ -937,7 +941,7 @@ ACE_Asynch_Accept_Handler::handle_input (ACE_HANDLE fd)
pid_t pid = ACE_OS::getpid ();
if (pid == (pid_t) -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "Error:(%P | %t):%p:",
+ "Error:(%P | %t):%p",
"<getpid> failed\n"),
-1);
@@ -948,7 +952,7 @@ ACE_Asynch_Accept_Handler::handle_input (ACE_HANDLE fd)
// Queue the signal.
if (sigqueue (pid, ACE_SIG_AIO, value) == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "Error:(%P | %t):%p:",
+ "Error:(%P | %t):%p",
"<sigqueue> failed\n"),
-1);
}
@@ -989,7 +993,7 @@ ACE_Asynch_Accept::ACE_Asynch_Accept (void)
#if defined (ACE_HAS_AIO_CALLS)
int
-ACE_Asynch_Accept::open(ACE_Handler &handler,
+ACE_Asynch_Accept::open (ACE_Handler &handler,
ACE_HANDLE handle,
const void *completion_key,
ACE_Proactor *proactor)
@@ -1563,7 +1567,8 @@ ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
if (file_size == -1)
ACE_ERROR_RETURN ((LM_ERROR,
- "%p:Asynch_Transmit_File:Couldnt know the file size\n"),
+ "Error:%p\n",
+ ":Asynch_Transmit_File:Couldnt know the file size"),
-1);
if (bytes_to_write == 0)
@@ -1571,7 +1576,8 @@ ACE_Asynch_Transmit_File::transmit_file (ACE_HANDLE file,
if (offset > (size_t) file_size)
ACE_ERROR_RETURN ((LM_ERROR,
- "Asynch_Transmit_File:File size is less than offset\n"),
+ "Error:%p\n",
+ "Asynch_Transmit_File:File size is less than offset"),
-1);
if (offset != 0)