summaryrefslogtreecommitdiff
path: root/ACE/ace/POSIX_Proactor.cpp
diff options
context:
space:
mode:
authorSteve Huston <shuston@riverace.com>2007-01-10 00:22:18 +0000
committerSteve Huston <shuston@riverace.com>2007-01-10 00:22:18 +0000
commit50aaf7a4808f1f06c789cde75cb32f340e8e856c (patch)
tree979795074af73840a65d9ad97649b93f5b1113d2 /ACE/ace/POSIX_Proactor.cpp
parent6a86433cf70477c51a6954dc8b1edd3a6ce75a1d (diff)
downloadATCD-50aaf7a4808f1f06c789cde75cb32f340e8e856c.tar.gz
ChangeLogTag:Wed Jan 10 00:22:01 UTC 2007 Steve Huston <shuston@riverace.com>
Diffstat (limited to 'ACE/ace/POSIX_Proactor.cpp')
-rw-r--r--ACE/ace/POSIX_Proactor.cpp17
1 files changed, 8 insertions, 9 deletions
diff --git a/ACE/ace/POSIX_Proactor.cpp b/ACE/ace/POSIX_Proactor.cpp
index 395f5a08a32..4b4563414bb 100644
--- a/ACE/ace/POSIX_Proactor.cpp
+++ b/ACE/ace/POSIX_Proactor.cpp
@@ -882,8 +882,8 @@ int ACE_POSIX_AIOCB_Proactor::delete_result_aiocb_list (void)
size_t ai;
- // Try to cancel all uncomlpeted operarion POSIX systems may have
- // hidden system threads that still can work with our aiocb's!
+ // Try to cancel all uncompleted operations; POSIX systems may have
+ // hidden system threads that still can work with our aiocbs!
for (ai = 0; ai < aiocb_list_max_size_; ai++)
if (this->aiocb_list_[ai] != 0) // active operation
this->cancel_aiocb (result_list_[ai]);
@@ -1123,7 +1123,7 @@ ACE_POSIX_Asynch_Result * ACE_POSIX_AIOCB_Proactor::getq_result (void)
if (this->result_queue_.dequeue_head (result) != 0)
return 0;
-// don;t waste time if queue is empty - it is normal
+// 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",
@@ -1194,10 +1194,8 @@ ACE_POSIX_AIOCB_Proactor::handle_events_i (u_long milli_seconds)
if (errno != EAGAIN && // Timeout
errno != EINTR ) // Interrupted call
ACE_ERROR ((LM_ERROR,
- "%N:%l:(%P | %t)::%p\n",
- "ACE_POSIX_AIOCB_Proactor::handle_events:"
- "aio_suspend failed\n"));
-
+ ACE_LIB_TEXT ("%N:%l:(%P|%t)::%p\n"),
+ ACE_LIB_TEXT ("handle_events: aio_suspend failed")));
// let continue work
// we should check "post_completed" queue
}
@@ -1329,8 +1327,9 @@ ACE_POSIX_AIOCB_Proactor::start_aio (ACE_POSIX_Asynch_Result *result,
default:
ACE_ERROR_RETURN ((LM_ERROR,
- "%N:%l:(%P | %t)::\n"
- "start_aio: Invalid operation code\n"),
+ ACE_LIB_TEXT ("%N:%l:(%P|%t)::")
+ ACE_LIB_TEXT ("start_aio: Invalid op code %d\n"),
+ op),
-1);
}