summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog15
-rw-r--r--ChangeLogs/ChangeLog-02a15
-rw-r--r--ChangeLogs/ChangeLog-03a15
-rw-r--r--ace/RMCast/RMCast_IO_UDP.cpp26
-rw-r--r--ace/RMCast/RMCast_Reassembly.cpp2
-rw-r--r--protocols/ace/RMCast/RMCast_IO_UDP.cpp26
-rw-r--r--protocols/ace/RMCast/RMCast_Reassembly.cpp2
-rw-r--r--tests/CDR_Array_Test.cpp6
-rw-r--r--tests/RMCast/RMCast_Fragment_Test.cpp30
-rw-r--r--tests/RMCast/RMCast_Membership_Test.cpp44
-rw-r--r--tests/RMCast/RMCast_Reassembly_Test.cpp28
-rw-r--r--tests/RMCast/RMCast_Reordering_Test.cpp22
-rw-r--r--tests/RMCast/RMCast_Retransmission_Test.cpp37
-rw-r--r--tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp28
14 files changed, 183 insertions, 113 deletions
diff --git a/ChangeLog b/ChangeLog
index de45058c386..1fac43673b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+Thu Oct 26 11:20:43 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/RMCast/RMCast_IO_UDP.cpp:
+ * ace/RMCast/RMCast_Reassembly.cpp:
+ * tests/CDR_Array_Test.cpp:
+ * tests/RMCast/RMCast_Fragment_Test.cpp:
+ * tests/RMCast/RMCast_Membership_Test.cpp:
+ * tests/RMCast/RMCast_Reassembly_Test.cpp:
+ * tests/RMCast/RMCast_Reordering_Test.cpp:
+ * tests/RMCast/RMCast_Retransmission_Test.cpp:
+ * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp:
+
+ The usual additions of ACE_TEXT to make ACE_USES_WCHAR builds
+ happy.
+
Thu Oct 26 12:19:45 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* ace/Memory_Pool.cpp (unmap): Fixed a bug that was preventing
diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a
index de45058c386..1fac43673b8 100644
--- a/ChangeLogs/ChangeLog-02a
+++ b/ChangeLogs/ChangeLog-02a
@@ -1,3 +1,18 @@
+Thu Oct 26 11:20:43 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/RMCast/RMCast_IO_UDP.cpp:
+ * ace/RMCast/RMCast_Reassembly.cpp:
+ * tests/CDR_Array_Test.cpp:
+ * tests/RMCast/RMCast_Fragment_Test.cpp:
+ * tests/RMCast/RMCast_Membership_Test.cpp:
+ * tests/RMCast/RMCast_Reassembly_Test.cpp:
+ * tests/RMCast/RMCast_Reordering_Test.cpp:
+ * tests/RMCast/RMCast_Retransmission_Test.cpp:
+ * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp:
+
+ The usual additions of ACE_TEXT to make ACE_USES_WCHAR builds
+ happy.
+
Thu Oct 26 12:19:45 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* ace/Memory_Pool.cpp (unmap): Fixed a bug that was preventing
diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a
index de45058c386..1fac43673b8 100644
--- a/ChangeLogs/ChangeLog-03a
+++ b/ChangeLogs/ChangeLog-03a
@@ -1,3 +1,18 @@
+Thu Oct 26 11:20:43 2000 Darrell Brunsch <brunsch@uci.edu>
+
+ * ace/RMCast/RMCast_IO_UDP.cpp:
+ * ace/RMCast/RMCast_Reassembly.cpp:
+ * tests/CDR_Array_Test.cpp:
+ * tests/RMCast/RMCast_Fragment_Test.cpp:
+ * tests/RMCast/RMCast_Membership_Test.cpp:
+ * tests/RMCast/RMCast_Reassembly_Test.cpp:
+ * tests/RMCast/RMCast_Reordering_Test.cpp:
+ * tests/RMCast/RMCast_Retransmission_Test.cpp:
+ * tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp:
+
+ The usual additions of ACE_TEXT to make ACE_USES_WCHAR builds
+ happy.
+
Thu Oct 26 12:19:45 2000 Douglas C. Schmidt <schmidt@ace.cs.wustl.edu>
* ace/Memory_Pool.cpp (unmap): Fixed a bug that was preventing
diff --git a/ace/RMCast/RMCast_IO_UDP.cpp b/ace/RMCast/RMCast_IO_UDP.cpp
index c5f42eea535..2d736846417 100644
--- a/ace/RMCast/RMCast_IO_UDP.cpp
+++ b/ace/RMCast/RMCast_IO_UDP.cpp
@@ -92,12 +92,12 @@ ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE)
{
// @@ LOG??
ACE_ERROR ((LM_ERROR,
- "RMCast_IO_UDP::handle_input () - "
- "error in recv %p\n", ""));
+ ACE_TEXT ("RMCast_IO_UDP::handle_input () - ")
+ ACE_TEXT ("error in recv %p\n"), ACE_TEXT ("")));
return -1;
}
- // ACE_HEX_DUMP ((LM_DEBUG, buffer, 16, "Receiver::handle_input"));
+ // ACE_HEX_DUMP ((LM_DEBUG, buffer, 16, ACE_TEXT ("Receiver::handle_input")));
// @@ Locking!
@@ -128,7 +128,7 @@ ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE)
if (this->map_.find (from_address, proxy) != 0)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::handle_input - new proxy from <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::handle_input - new proxy from <%s:%d>\n"),
// from_address.get_host_addr (),
// from_address.get_port_number ()));
@@ -234,7 +234,7 @@ ACE_RMCast_IO_UDP::send_data (ACE_RMCast::Data &data,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_data - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_data - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -286,7 +286,9 @@ ACE_RMCast_IO_UDP::send_data (ACE_RMCast::Data &data,
#if 0
ACE_HEX_DUMP ((LM_DEBUG,
- (char*)iov[0].iov_base, iov[0].iov_len, "Sending"));
+ (char*)iov[0].iov_base,
+ iov[0].iov_len,
+ ACE_TEXT ("Sending")));
#endif
return 0;
@@ -297,7 +299,7 @@ ACE_RMCast_IO_UDP::send_poll (ACE_RMCast::Poll &,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_poll - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_poll - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -320,7 +322,7 @@ ACE_RMCast_IO_UDP::send_ack_join (ACE_RMCast::Ack_Join &ack_join,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_ack_join - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_ack_join - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -346,7 +348,7 @@ ACE_RMCast_IO_UDP::send_ack_leave (ACE_RMCast::Ack_Leave &,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_ack_leave - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_ack_leave - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -369,7 +371,7 @@ ACE_RMCast_IO_UDP::send_ack (ACE_RMCast::Ack &ack,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_ack - pushing (%d:%d) out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_ack - pushing (%d:%d) out to <%s:%d>\n"),
// ack.next_expected,
// ack.highest_received,
// to.get_host_addr (),
@@ -401,7 +403,7 @@ ACE_RMCast_IO_UDP::send_join (ACE_RMCast::Join &,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_join - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_join - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -424,7 +426,7 @@ ACE_RMCast_IO_UDP::send_leave (ACE_RMCast::Leave &,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_leave - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_leave - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
diff --git a/ace/RMCast/RMCast_Reassembly.cpp b/ace/RMCast/RMCast_Reassembly.cpp
index 5d4cc34b4c8..a39155cfbd9 100644
--- a/ace/RMCast/RMCast_Reassembly.cpp
+++ b/ace/RMCast/RMCast_Reassembly.cpp
@@ -51,7 +51,7 @@ ACE_RMCast_Reassembly::data (ACE_RMCast::Data &data)
if (data.payload->length () + data.fragment_offset > data.total_size)
{
ACE_ERROR ((LM_ERROR,
- "RMCast_Reassembly::data - invalid size\n"));
+ ACE_TEXT ("RMCast_Reassembly::data - invalid size\n")));
return -1; // Corrupt message?
}
diff --git a/protocols/ace/RMCast/RMCast_IO_UDP.cpp b/protocols/ace/RMCast/RMCast_IO_UDP.cpp
index c5f42eea535..2d736846417 100644
--- a/protocols/ace/RMCast/RMCast_IO_UDP.cpp
+++ b/protocols/ace/RMCast/RMCast_IO_UDP.cpp
@@ -92,12 +92,12 @@ ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE)
{
// @@ LOG??
ACE_ERROR ((LM_ERROR,
- "RMCast_IO_UDP::handle_input () - "
- "error in recv %p\n", ""));
+ ACE_TEXT ("RMCast_IO_UDP::handle_input () - ")
+ ACE_TEXT ("error in recv %p\n"), ACE_TEXT ("")));
return -1;
}
- // ACE_HEX_DUMP ((LM_DEBUG, buffer, 16, "Receiver::handle_input"));
+ // ACE_HEX_DUMP ((LM_DEBUG, buffer, 16, ACE_TEXT ("Receiver::handle_input")));
// @@ Locking!
@@ -128,7 +128,7 @@ ACE_RMCast_IO_UDP::handle_input (ACE_HANDLE)
if (this->map_.find (from_address, proxy) != 0)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::handle_input - new proxy from <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::handle_input - new proxy from <%s:%d>\n"),
// from_address.get_host_addr (),
// from_address.get_port_number ()));
@@ -234,7 +234,7 @@ ACE_RMCast_IO_UDP::send_data (ACE_RMCast::Data &data,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_data - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_data - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -286,7 +286,9 @@ ACE_RMCast_IO_UDP::send_data (ACE_RMCast::Data &data,
#if 0
ACE_HEX_DUMP ((LM_DEBUG,
- (char*)iov[0].iov_base, iov[0].iov_len, "Sending"));
+ (char*)iov[0].iov_base,
+ iov[0].iov_len,
+ ACE_TEXT ("Sending")));
#endif
return 0;
@@ -297,7 +299,7 @@ ACE_RMCast_IO_UDP::send_poll (ACE_RMCast::Poll &,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_poll - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_poll - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -320,7 +322,7 @@ ACE_RMCast_IO_UDP::send_ack_join (ACE_RMCast::Ack_Join &ack_join,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_ack_join - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_ack_join - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -346,7 +348,7 @@ ACE_RMCast_IO_UDP::send_ack_leave (ACE_RMCast::Ack_Leave &,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_ack_leave - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_ack_leave - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -369,7 +371,7 @@ ACE_RMCast_IO_UDP::send_ack (ACE_RMCast::Ack &ack,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_ack - pushing (%d:%d) out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_ack - pushing (%d:%d) out to <%s:%d>\n"),
// ack.next_expected,
// ack.highest_received,
// to.get_host_addr (),
@@ -401,7 +403,7 @@ ACE_RMCast_IO_UDP::send_join (ACE_RMCast::Join &,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_join - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_join - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
@@ -424,7 +426,7 @@ ACE_RMCast_IO_UDP::send_leave (ACE_RMCast::Leave &,
const ACE_INET_Addr &to)
{
//ACE_DEBUG ((LM_DEBUG,
- // "IO_UDP::send_leave - pushing out to <%s:%d>\n",
+ // ACE_TEXT ("IO_UDP::send_leave - pushing out to <%s:%d>\n"),
// to.get_host_addr (),
// to.get_port_number ()));
diff --git a/protocols/ace/RMCast/RMCast_Reassembly.cpp b/protocols/ace/RMCast/RMCast_Reassembly.cpp
index 5d4cc34b4c8..a39155cfbd9 100644
--- a/protocols/ace/RMCast/RMCast_Reassembly.cpp
+++ b/protocols/ace/RMCast/RMCast_Reassembly.cpp
@@ -51,7 +51,7 @@ ACE_RMCast_Reassembly::data (ACE_RMCast::Data &data)
if (data.payload->length () + data.fragment_offset > data.total_size)
{
ACE_ERROR ((LM_ERROR,
- "RMCast_Reassembly::data - invalid size\n"));
+ ACE_TEXT ("RMCast_Reassembly::data - invalid size\n")));
return -1; // Corrupt message?
}
diff --git a/tests/CDR_Array_Test.cpp b/tests/CDR_Array_Test.cpp
index 9a97902f9e0..8c8e9f4dcd8 100644
--- a/tests/CDR_Array_Test.cpp
+++ b/tests/CDR_Array_Test.cpp
@@ -496,7 +496,7 @@ CDR_Test<T, H>::do_test (int total, int niter, int use_array,
int n;
for (n = 0; n < niter; n++)
{
- ACE_DEBUG ((LM_DEBUG, "====== Read iteration %d\n", n));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("====== Read iteration %d\n", n)));
int size = (total + dst_offset) * H::size ();
ACE_InputCDR is (toread, size, opposite_byte_order);
@@ -621,8 +621,8 @@ CDR_Test<T, H>::do_test (int total, int niter, int use_array,
if (errors != 0)
{
ACE_ERROR((LM_ERROR,
- ACE_TEXT (" assertion failed: Inconsistencies found (%d), "
- "aborting.\n"), errors));
+ ACE_TEXT (" assertion failed: Inconsistencies found (%d), ")
+ ACE_TEXT ("aborting.\n"), errors));
ACE_OS::exit(1);
}
diff --git a/tests/RMCast/RMCast_Fragment_Test.cpp b/tests/RMCast/RMCast_Fragment_Test.cpp
index 909bab01f05..f3a3e1ea7b3 100644
--- a/tests/RMCast/RMCast_Fragment_Test.cpp
+++ b/tests/RMCast/RMCast_Fragment_Test.cpp
@@ -55,7 +55,7 @@ main (int, ACE_TCHAR *[])
ACE_RMCast_Fragment_Tester tester;
if (tester.svc () == -1)
- ACE_ERROR ((LM_ERROR, "Error running the svc() routine\n"));
+ ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error running the svc() routine\n")));
ACE_END_TEST;
return 0;
@@ -89,15 +89,15 @@ ACE_RMCast_Fragment_Tester::svc (void)
if (this->received_bytes_ != n)
ACE_ERROR_RETURN ((LM_ERROR,
- "Unexpected number of "
- "received bytes (%d/%d)\n",
+ ACE_TEXT ("Unexpected number of ")
+ ACE_TEXT ("received bytes (%d/%d)\n"),
this->received_bytes_, n),
-1);
if (this->compare (&big_blob) == -1)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Mismatched big_blob data\n"),
+ ACE_TEXT ("Mismatched big_blob data\n")),
-1);
return -1;
}
@@ -132,15 +132,15 @@ ACE_RMCast_Fragment_Tester::svc (void)
ACE_UINT32 total = n * size;
if (this->received_bytes_ != total)
ACE_ERROR_RETURN ((LM_ERROR,
- "Unpexpected number of "
- "received bytes (%d/%d)\n",
+ ACE_TEXT ("Unexpected number of ")
+ ACE_TEXT ("received bytes (%d/%d)\n"),
this->received_bytes_, total),
-1);
if (this->compare (small) == -1)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Mismatched small chain data\n"),
+ ACE_TEXT ("Mismatched small chain data\n")),
-1);
return -1;
}
@@ -181,15 +181,15 @@ ACE_RMCast_Fragment_Tester::svc (void)
if (this->received_bytes_ != total)
ACE_ERROR_RETURN ((LM_ERROR,
- "Unpexpected number of "
- "received bytes (%d/%d)\n",
+ ACE_TEXT ("Unexpected number of ")
+ ACE_TEXT ("received bytes (%d/%d)\n"),
this->received_bytes_, total),
-1);
if (this->compare (small) == -1)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Mismatched small chain data\n"),
+ ACE_TEXT ("Mismatched small chain data\n")),
-1);
return -1;
}
@@ -234,11 +234,11 @@ ACE_RMCast_Fragment_Tester::compare (ACE_Message_Block *mb)
ACE_HEX_DUMP ((LM_DEBUG,
blob.rd_ptr () + offset,
z,
- "BIG BLOB"));
+ ACE_TEXT ("BIG BLOB")));
ACE_HEX_DUMP ((LM_DEBUG,
this->received_.rd_ptr () + offset,
z,
- "RECEIVED"));
+ ACE_TEXT ("RECEIVED")));
}
return -1;
}
@@ -263,11 +263,11 @@ ACE_RMCast_Fragment_Tester::data (ACE_RMCast::Data &data)
{
if (this->message_sequence_number_ != sequence_number)
ACE_ERROR_RETURN ((LM_ERROR,
- "Mismatched sequence number\n"),
+ ACE_TEXT ("Mismatched sequence number\n")),
-1);
if (this->received_.length () != message_size)
ACE_ERROR_RETURN ((LM_ERROR,
- "Mismatched sequence size\n"),
+ ACE_TEXT ("Mismatched sequence size\n")),
-1);
}
@@ -296,7 +296,7 @@ ACE_RMCast_Fragment_Tester::data (ACE_RMCast::Data &data)
if (fragment_size > this->fragment_.max_fragment_size ())
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid fragment size\n"),
+ ACE_TEXT ("Invalid fragment size\n")),
-1);
return 0;
diff --git a/tests/RMCast/RMCast_Membership_Test.cpp b/tests/RMCast/RMCast_Membership_Test.cpp
index 240382ba758..88ba88a4950 100644
--- a/tests/RMCast/RMCast_Membership_Test.cpp
+++ b/tests/RMCast/RMCast_Membership_Test.cpp
@@ -169,18 +169,20 @@ main (int, ACE_TCHAR *[])
ACE::beta_version()));
{
- ACE_DEBUG ((LM_DEBUG, "Running single threaded test\n"));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running single threaded test\n")));
//! Run the test in single threaded mode
Tester tester;
tester.run (100);
}
{
- ACE_DEBUG ((LM_DEBUG, "Running multi threaded test\n"));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running multi threaded test\n")));
//! Run the test in multi-threaded mode
Tester tester;
Task task (&tester);
if (task.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "Cannot activate the threads\n"), 1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("Cannot activate the threads\n")),
+ 1);
ACE_Thread_Manager::instance ()->wait ();
}
@@ -231,7 +233,7 @@ Tester::join (ACE_RMCast::Join &join)
if (join.source == 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid join message in Tester\n"),
+ ACE_TEXT ("Invalid join message in Tester\n")),
-1);
}
for (size_t i = 0; i != nproxy; ++i)
@@ -240,13 +242,15 @@ Tester::join (ACE_RMCast::Join &join)
continue;
if (this->proxy_[i].joined () != 1)
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid state for proxy %d "
- "in Tester::join\n"),
+ ACE_TEXT ("Invalid state for proxy %d ")
+ ACE_TEXT ("in Tester::join\n")),
-1);
return 0;
}
// Not found
- ACE_ERROR_RETURN ((LM_ERROR, "Unknown proxy in Tester::join\n"), -1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("Unknown proxy in Tester::join\n")),
+ -1);
}
int
@@ -255,7 +259,7 @@ Tester::leave (ACE_RMCast::Leave &leave)
if (leave.source == 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid leave message in Tester\n"),
+ ACE_TEXT ("Invalid leave message in Tester\n")),
-1);
}
for (size_t i = 0; i != nproxy; ++i)
@@ -264,13 +268,15 @@ Tester::leave (ACE_RMCast::Leave &leave)
continue;
if (this->proxy_[i].joined () != 0)
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid state for proxy %d "
- "in Tester::leave\n"),
+ ACE_TEXT ("Invalid state for proxy %d ")
+ ACE_TEXT ("in Tester::leave\n")),
-1);
return 0;
}
// Not found
- ACE_ERROR_RETURN ((LM_ERROR, "Unknown proxy in Tester::leave\n"), -1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("Unknown proxy in Tester::leave\n")),
+ -1);
}
int
@@ -280,12 +286,12 @@ Tester::ack (ACE_RMCast::Ack &ack)
if (ack.source == 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid ack message in Tester\n"),
+ ACE_TEXT ("Invalid ack message in Tester\n")),
-1);
}
// ACE_DEBUG ((LM_DEBUG,
- // "Received ack in Tester %d,%d\n",
+ // ACE_TEXT ("Received ack in Tester %d,%d\n"),
// ack.next_expected,
// ack.highest_received));
@@ -328,13 +334,13 @@ Tester::ack (ACE_RMCast::Ack &ack)
if (ack.next_expected != next_expected)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid next_expected in Ack\n"),
+ ACE_TEXT ("Invalid next_expected in Ack\n")),
-1);
}
if (ack.highest_received != highest_received)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid highest_received in Ack\n"),
+ ACE_TEXT ("Invalid highest_received in Ack\n")),
-1);
}
return 0;
@@ -354,7 +360,7 @@ Tester::join_random (void)
ACE_RMCast::Join join;
join.source = &this->proxy_[i];
// ACE_DEBUG ((LM_DEBUG,
- // "Sending join mesage for proxy %d\n",
+ // ACE_TEXT ("Sending join mesage for proxy %d\n"),
// i));
this->proxy_[i].join (join);
}
@@ -375,7 +381,7 @@ Tester::leave_random (void)
ACE_RMCast::Leave leave;
leave.source = &this->proxy_[i];
// ACE_DEBUG ((LM_DEBUG,
- // "Sending leave mesage for proxy %d\n",
+ // ACE_TEXT ("Sending leave mesage for proxy %d\n"),
// i));
this->proxy_[i].leave (leave);
}
@@ -420,7 +426,7 @@ Tester::generate_acks (int iterations)
break;
}
// ACE_DEBUG ((LM_DEBUG,
- // "Sending ack message (%d,%d) through proxy %d\n",
+ // ACE_TEXT ("Sending ack message (%d,%d) through proxy %d\n"),
// ack.next_expected,
// ack.highest_received,
// i));
@@ -428,7 +434,7 @@ Tester::generate_acks (int iterations)
if (result != 0)
{
ACE_ERROR ((LM_ERROR,
- "Returned %d in proxy %d\n",
+ ACE_TEXT ("Returned %d in proxy %d\n"),
result, i));
}
}
diff --git a/tests/RMCast/RMCast_Reassembly_Test.cpp b/tests/RMCast/RMCast_Reassembly_Test.cpp
index 34a262cb617..7c4cc575cd2 100644
--- a/tests/RMCast/RMCast_Reassembly_Test.cpp
+++ b/tests/RMCast/RMCast_Reassembly_Test.cpp
@@ -64,7 +64,9 @@ main (int, ACE_TCHAR *[])
ACE_RMCast_Reassembly_Tester tester;
if (tester.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "Cannot activate the threads\n"), 1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("Cannot activate the threads\n")),
+ 1);
ACE_Thread_Manager::instance ()->wait ();
@@ -85,7 +87,7 @@ ACE_RMCast_Reassembly_Tester::svc (void)
{
for (int iteration = 0; iteration != 50; ++iteration)
{
- ACE_DEBUG ((LM_DEBUG, "(%t) iteration %d\n", iteration));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("(%t) iteration %d\n"), iteration));
ACE_UINT32 sequence_number = this->next_sequence_number ();
{
ACE_Message_Block received;
@@ -111,7 +113,7 @@ ACE_RMCast_Reassembly_Tester::svc (void)
&big_blob) == -1)
{
ACE_DEBUG ((LM_DEBUG,
- "Error in put_fragment\n"));
+ ACE_TEXT ("Error in put_fragment\n")));
return -1;
}
}
@@ -119,13 +121,14 @@ ACE_RMCast_Reassembly_Tester::svc (void)
if (this->compare (&received, &big_blob) == -1)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Mismatched big_blob data\n"),
+ ACE_TEXT ("Mismatched big_blob data\n")),
-1);
return -1;
}
}
- ACE_DEBUG ((LM_DEBUG, "(%t) iteration %d, first test passed\n",
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%t) iteration %d, first test passed\n"),
iteration));
sequence_number = this->next_sequence_number ();
{
@@ -159,7 +162,7 @@ ACE_RMCast_Reassembly_Tester::svc (void)
&big_blob) == -1)
{
ACE_DEBUG ((LM_DEBUG,
- "Error in put_fragment\n"));
+ ACE_TEXT ("Error in put_fragment\n")));
return -1;
}
}
@@ -172,7 +175,7 @@ ACE_RMCast_Reassembly_Tester::svc (void)
&big_blob) == -1)
{
ACE_DEBUG ((LM_DEBUG,
- "Error in put_fragment\n"));
+ ACE_TEXT ("Error in put_fragment\n")));
return -1;
}
}
@@ -180,12 +183,13 @@ ACE_RMCast_Reassembly_Tester::svc (void)
if (this->compare (&received, &big_blob) == -1)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Mismatched random big_blob data\n"),
+ ACE_TEXT ("Mismatched random big_blob data\n")),
-1);
return -1;
}
}
- ACE_DEBUG ((LM_DEBUG, "(%t) iteration %d, random test passed\n",
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("(%t) iteration %d, random test passed\n"),
iteration));
}
@@ -218,7 +222,7 @@ ACE_RMCast_Reassembly_Tester::compare (ACE_Message_Block *received,
}
if (received->rd_ptr () == 0)
- ACE_ERROR_RETURN ((LM_DEBUG, "INCOMPLETE MESSAGE\n"), -1);
+ ACE_ERROR_RETURN ((LM_DEBUG, ACE_TEXT ("INCOMPLETE MESSAGE\n")), -1);
if (ACE_OS::memcmp (blob.rd_ptr (),
received->rd_ptr (),
@@ -232,7 +236,7 @@ ACE_RMCast_Reassembly_Tester::compare (ACE_Message_Block *received,
ACE_HEX_DUMP ((LM_DEBUG,
blob.rd_ptr () + i,
z,
- "BIG BLOB"));
+ ACE_TEXT ("BIG BLOB")));
}
for (size_t j = 0; j < n; j += 256)
{
@@ -242,7 +246,7 @@ ACE_RMCast_Reassembly_Tester::compare (ACE_Message_Block *received,
ACE_HEX_DUMP ((LM_DEBUG,
received->rd_ptr () + j,
z,
- "RECEIVED"));
+ ACE_TEXT ("RECEIVED")));
}
return -1;
}
diff --git a/tests/RMCast/RMCast_Reordering_Test.cpp b/tests/RMCast/RMCast_Reordering_Test.cpp
index 93b1c856826..383d06a7ddf 100644
--- a/tests/RMCast/RMCast_Reordering_Test.cpp
+++ b/tests/RMCast/RMCast_Reordering_Test.cpp
@@ -143,18 +143,20 @@ main (int, ACE_TCHAR *[])
ACE::beta_version()));
{
- ACE_DEBUG ((LM_DEBUG, "Running single threaded test\n"));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running single threaded test\n")));
//! Run the test in single threaded mode
Tester tester;
tester.run (100);
}
{
- ACE_DEBUG ((LM_DEBUG, "Running multi threaded test\n"));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running multi threaded test\n")));
//! Run the test in multi-threaded mode
Tester tester;
Task task (&tester);
if (task.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "Cannot activate the threads\n"), 1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("Cannot activate the threads\n")),
+ 1);
ACE_Thread_Manager::instance ()->wait ();
}
@@ -188,7 +190,7 @@ Tester::run (int iterations)
if (result != 0)
{
ACE_ERROR ((LM_ERROR,
- "Reordering::ack_join returned %d\n",
+ ACE_TEXT ("Reordering::ack_join returned %d\n"),
result));
}
@@ -200,11 +202,12 @@ Tester::run (int iterations)
if (this->next_expected_ == 0)
{
ACE_ERROR ((LM_ERROR,
- "Tester::run - no messages received\n"));
+ ACE_TEXT ("Tester::run - no messages received\n")));
}
else
{
- ACE_DEBUG ((LM_DEBUG, "Tester::run (%t) - %d messages received\n",
+ ACE_DEBUG ((LM_DEBUG,
+ ACE_TEXT ("Tester::run (%t) - %d messages received\n"),
this->next_expected_));
}
}
@@ -214,7 +217,7 @@ Tester::reply_ack (ACE_RMCast::Ack &ack)
{
ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->mutex_, -1);
- // ACE_DEBUG ((LM_DEBUG, "Received Ack message (%d, %d)\n",
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Received Ack message (%d, %d)\n"),
// ack.next_expected, this->lowest_sequence_number_));
const int success_ratio = 95;
@@ -260,7 +263,7 @@ Tester::generate_messages (int count)
if (result != 0)
{
ACE_ERROR ((LM_ERROR,
- "Reordering::data returned %d\n",
+ ACE_TEXT ("Reordering::data returned %d\n"),
result));
}
}
@@ -275,7 +278,8 @@ Tester::data (ACE_RMCast::Data &data)
if (this->next_expected_ != data.sequence_number)
{
ACE_ERROR ((LM_ERROR,
- "Tester::data - out of sequence message (%d != %d)\n",
+ ACE_TEXT ("Tester::data - ")
+ ACE_TEXT ("out of sequence message (%d != %d)\n"),
this->next_expected_,
data.sequence_number));
return -1;
diff --git a/tests/RMCast/RMCast_Retransmission_Test.cpp b/tests/RMCast/RMCast_Retransmission_Test.cpp
index 7dd23c5f830..a69f2129718 100644
--- a/tests/RMCast/RMCast_Retransmission_Test.cpp
+++ b/tests/RMCast/RMCast_Retransmission_Test.cpp
@@ -190,19 +190,21 @@ main (int, ACE_TCHAR *[])
ACE::beta_version()));
{
- ACE_DEBUG ((LM_DEBUG, "Running single threaded test\n"));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running single threaded test\n")));
//! Run the test in single threaded mode
Tester tester;
tester.run (100);
tester.validate_message_count ();
}
{
- ACE_DEBUG ((LM_DEBUG, "Running multi threaded test\n"));
+ ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Running multi threaded test\n")));
//! Run the test in multi-threaded mode
Tester tester;
Task task (&tester);
if (task.activate (THR_NEW_LWP|THR_JOINABLE, 4) == -1)
- ACE_ERROR_RETURN ((LM_ERROR, "Cannot activate the threads\n"), 1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("Cannot activate the threads\n")),
+ 1);
ACE_Thread_Manager::instance ()->wait ();
tester.validate_message_count ();
}
@@ -261,8 +263,8 @@ Tester::validate_message_count (void)
if (this->proxy_[i].next_expected () != this->sequence_number_generator_)
{
ACE_ERROR ((LM_ERROR,
- "Invalid message count for proxy %d, "
- "it is %d, should be %d\n",
+ ACE_TEXT ("Invalid message count for proxy %d, ")
+ ACE_TEXT ("it is %d, should be %d\n"),
i, this->proxy_[i].next_expected (),
this->sequence_number_generator_));
}
@@ -275,7 +277,8 @@ Tester::reply_ack_join (Test_Proxy *, ACE_RMCast::Ack_Join &ack_join)
if (ack_join.next_sequence_number > this->sequence_number_generator_)
{
ACE_ERROR ((LM_ERROR,
- "Unexpected sequence number in ack_join (%d,%d)\n",
+ ACE_TEXT ("Unexpected sequence number in ack_join ")
+ ACE_TEXT ("(%d,%d)\n"),
ack_join.next_sequence_number,
this->sequence_number_generator_));
return -1;
@@ -315,7 +318,7 @@ Tester::send_ack ()
}
if (!set)
return 0;
- // ACE_DEBUG ((LM_DEBUG, "Tested::ack - (%d,%d)\n",
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("Tested::ack - (%d,%d)\n"),
// ack.next_expected, ack.highest_received));
return this->retransmission_.ack (ack);
}
@@ -337,7 +340,7 @@ Tester::generate_one_message (void)
if (result != 0)
{
ACE_ERROR ((LM_ERROR,
- "Retransmission::data returned %d\n",
+ ACE_TEXT ("Retransmission::data returned %d\n"),
result));
}
}
@@ -351,7 +354,7 @@ Tester::resend (void)
if (r == -1)
{
// ACE_DEBUG ((LM_DEBUG,
- // "Error returned from Retransmission::resend\n"));
+ // ACE_TEXT ("Error returned from Retransmission::resend\n")));
}
return r;
}
@@ -374,7 +377,7 @@ Tester::data (ACE_RMCast::Data &data)
if (result != 0)
{
ACE_ERROR ((LM_ERROR,
- "Proxy::data returned %d for proxy %d\n",
+ ACE_TEXT ("Proxy::data returned %d for proxy %d\n"),
result, i));
return -1;
}
@@ -408,7 +411,7 @@ Test_Proxy::Test_Proxy (void)
int
Test_Proxy::data (ACE_RMCast::Data &data)
{
- // ACE_DEBUG ((LM_DEBUG, " (%t) Proxy receives message %d\n",
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT (" (%t) Proxy receives message %d\n"),
// data.sequence_number));
ACE_GUARD_RETURN (ACE_SYNCH_MUTEX, ace_mon, this->lock_, -1);
@@ -422,7 +425,7 @@ Test_Proxy::data (ACE_RMCast::Data &data)
ACE_RMCast::Ack ack;
ack.next_expected = this->next_expected ();
ack.highest_received = this->highest_received ();
- // ACE_DEBUG ((LM_DEBUG, "....it is an already accepted message\n"));
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("....it is an already accepted message\n")));
// Ack the message....
return this->ack (ack);
}
@@ -436,7 +439,7 @@ Test_Proxy::data (ACE_RMCast::Data &data)
{
// We ignore the message completely as if it was lost in the
// network
- // ACE_DEBUG ((LM_DEBUG, "....and drops it\n"));
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("....and drops it\n")));
return 0;
}
@@ -450,20 +453,20 @@ Test_Proxy::data (ACE_RMCast::Data &data)
{
ack.highest_received = data.sequence_number;
}
- // ACE_DEBUG ((LM_DEBUG, "....and accepts it\n"));
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("....and accepts it\n")));
// Ack the message....
return this->ack (ack);
}
- // ACE_DEBUG ((LM_DEBUG, "....the message is out of order\n"));
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("....the message is out of order\n")));
// This is an out of sequence number, maybe it is lost...
if (c > success_ratio)
{
- // ACE_DEBUG ((LM_DEBUG, "........and is dropped\n"));
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("........and is dropped\n")));
return 0;
}
- // ACE_DEBUG ((LM_DEBUG, "........and is accepted\n"));
+ // ACE_DEBUG ((LM_DEBUG, ACE_TEXT ("........and is accepted\n")));
ACE_RMCast::Ack ack;
ack.next_expected = this->next_expected ();
if (data.sequence_number < this->highest_received ())
diff --git a/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp b/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp
index 32f673ef152..2c8c8e80da7 100644
--- a/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp
+++ b/tests/RMCast/RMCast_UDP_Best_Effort_Test.cpp
@@ -127,15 +127,15 @@ main (int, ACE_TCHAR *[])
ACE::beta_version()));
ACE_INET_Addr mcast_group;
- mcast_group.set (12345, "224.9.9.1");
+ mcast_group.set (12345, ACE_TEXT ("224.9.9.1"));
Receiver receiver (mcast_group);
if (receiver.open () != 0)
- ACE_ERROR_RETURN ((LM_ERROR, "Error in Receiver::open\n"), 1);
+ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in Receiver::open\n")), 1);
Sender sender (mcast_group);
if (sender.activate () != 0)
- ACE_ERROR_RETURN ((LM_ERROR, "Error in Sender::activate\n"), 1);
+ ACE_ERROR_RETURN ((LM_ERROR, ACE_TEXT ("Error in Sender::activate\n")), 1);
ACE_Time_Value tv (120, 0);
for (;;)
@@ -145,7 +145,7 @@ main (int, ACE_TCHAR *[])
if (r < 0)
{
ACE_ERROR_RETURN ((LM_ERROR,
- "Error in handle_events()\n"),
+ ACE_TEXT ("Error in handle_events()\n")),
1);
}
if (tv == ACE_Time_Value::zero)
@@ -153,7 +153,9 @@ main (int, ACE_TCHAR *[])
}
if (ACE_Thread_Manager::instance ()->wait () != 0)
- ACE_ERROR_RETURN ((LM_ERROR, "Error in Thread_Manager::wait\n"), 1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("Error in Thread_Manager::wait\n")),
+ 1);
receiver.dump ();
@@ -181,7 +183,9 @@ int
Receiver::open (void)
{
if (this->io_udp_.subscribe (this->mcast_group_) != 0)
- ACE_ERROR_RETURN ((LM_ERROR, "Error in IO_UDP::subscribe\n"), -1);
+ ACE_ERROR_RETURN ((LM_ERROR,
+ ACE_TEXT ("Error in IO_UDP::subscribe\n")),
+ -1);
return 0;
}
@@ -190,13 +194,13 @@ Receiver::data (ACE_RMCast::Data &data)
{
if (data.total_size != message_size)
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid message size (%d,%d,%d)\n",
+ ACE_TEXT ("Invalid message size (%d,%d,%d)\n"),
data.sequence_number,
data.total_size,
data.fragment_offset), -1);
if (data.fragment_offset != 0)
ACE_ERROR_RETURN ((LM_ERROR,
- "Invalid message size (%d,%d,%d)\n",
+ ACE_TEXT ("Invalid message size (%d,%d,%d)\n"),
data.sequence_number,
data.total_size,
data.fragment_offset), -1);
@@ -208,7 +212,7 @@ Receiver::data (ACE_RMCast::Data &data)
{
if (*j != expected++)
ACE_ERROR_RETURN ((LM_ERROR,
- "Unexpected byte at pos %d\n",
+ ACE_TEXT ("Unexpected byte at pos %d\n"),
long(j - data.payload->rd_ptr ())), -1);
}
@@ -221,7 +225,7 @@ void
Receiver::dump (void)
{
ACE_DEBUG ((LM_DEBUG,
- "Message count = %d/%d\n",
+ ACE_TEXT ("Message count = %d/%d\n"),
this->message_count_,
total_message_count));
}
@@ -238,10 +242,10 @@ int
Sender::svc ()
{
if (this->fragment_.next (&this->io_udp_) != 0)
- ACE_ERROR ((LM_ERROR, "Error in Fragment::next()\n"));
+ ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error in Fragment::next()\n")));
if (this->io_udp_.subscribe (this->mcast_group_) != 0)
- ACE_ERROR ((LM_ERROR, "Error in IO_UDP::subscribe()\n"));
+ ACE_ERROR ((LM_ERROR, ACE_TEXT ("Error in IO_UDP::subscribe()\n")));
ACE_Message_Block big_blob (message_size);
big_blob.wr_ptr (message_size);
View Lorry Controller Status