summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-10-06 08:19:11 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-10-06 08:19:11 +0000
commit99f5ac11f6575e3548a0708982d551dd3546f626 (patch)
treec807d5c8aad0d5e7abbd5c04ec13ca84882c617d /tests
parent99b86417a8388e3f8e2081d98e2cdb7eb8e40938 (diff)
downloadATCD-99f5ac11f6575e3548a0708982d551dd3546f626.tar.gz
ChangeLogTag: Thu Oct 6 08:16:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'tests')
-rw-r--r--tests/Message_Queue_Test.cpp22
-rw-r--r--tests/Message_Queue_Test_Ex.cpp4
2 files changed, 13 insertions, 13 deletions
diff --git a/tests/Message_Queue_Test.cpp b/tests/Message_Queue_Test.cpp
index 01884fff603..62863c99d1e 100644
--- a/tests/Message_Queue_Test.cpp
+++ b/tests/Message_Queue_Test.cpp
@@ -20,9 +20,9 @@
// 3) a test/usage example of ACE_Message_Queue_Vx.
//
// = AUTHORS
-// Irfan Pyarali <irfan@cs.wustl.edu>,
-// David L. Levine <levine@cs.wustl.edu>, and
-// Douglas C. Schmidt <schmidt@vanderbilt.edu>
+// Irfan Pyarali <irfan@cs.wustl.edu>,
+// David L. Levine <levine@cs.wustl.edu>, and
+// Douglas C. Schmidt <schmidt@vanderbilt.edu>
//
// ============================================================================
@@ -189,7 +189,7 @@ single_thread_performance_test (int queue_type = 0)
"ACE_Message_Queue Test Message";
const ACE_TCHAR *message =
ACE_TEXT ("ACE_Message_Queue<ACE_NULL_SYNCH>, single thread");
- int i;
+ int i = 0;
// Create a message queue.
ACE_Message_Queue_Base *msgq = 0;
@@ -371,7 +371,7 @@ performance_test (int queue_type = 0)
Queue_Wrapper queue_wrapper;
const ACE_TCHAR *message =
ACE_TEXT ("ACE_Message_Queue<ACE_SYNCH>");
- int i;
+ int i = 0;
// Create the messages. Allocate off the heap in case messages is
// large relative to the amount of stack space available. Allocate
@@ -451,37 +451,37 @@ performance_test (int queue_type = 0)
// Ensure that the timedout dequeue_head() sets errno code properly.
-static int
+static int
timeout_test (void)
{
SYNCH_QUEUE mq;
int status = 0;
- if (!mq.is_empty ())
+ if (!mq.is_empty ())
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("New queue is not empty!\n")));
status = 1;
}
- else
+ else
{
ACE_Message_Block *b;
ACE_Time_Value tv (ACE_OS::gettimeofday ()); // Now
- if (mq.dequeue_head (b, &tv) != -1)
+ if (mq.dequeue_head (b, &tv) != -1)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("Dequeued from empty queue!\n")));
status = 1;
}
- else if (errno != EWOULDBLOCK)
+ else if (errno != EWOULDBLOCK)
{
ACE_ERROR ((LM_ERROR,
ACE_TEXT ("%p\n"),
ACE_TEXT ("Dequeue timeout should be EWOULDBLOCK, got")));
status = 1;
}
- else
+ else
{
ACE_DEBUG ((LM_DEBUG,
ACE_TEXT ("Timed dequeue test: OK\n")));
diff --git a/tests/Message_Queue_Test_Ex.cpp b/tests/Message_Queue_Test_Ex.cpp
index c7f7e6320ff..176f452c5c2 100644
--- a/tests/Message_Queue_Test_Ex.cpp
+++ b/tests/Message_Queue_Test_Ex.cpp
@@ -97,7 +97,7 @@ single_thread_performance_test (void)
User_Class *[max_messages],
-1);
- int i;
+ int i = 0;
for (i = 0; i < max_messages; ++i)
ACE_NEW_RETURN (send_block[i],
@@ -201,7 +201,7 @@ performance_test (void)
Queue_Wrapper queue_wrapper;
const ACE_TCHAR *message =
ACE_TEXT ("ACE_Message_Queue_Ex<ACE_SYNCH>");
- int i;
+ int i = 0;
// Create the messages. Allocate off the heap in case messages is
// large relative to the amount of stack space available. Allocate