From f167c9df1bf5e90e83df005a0fe9ed1cbc0a3ddf Mon Sep 17 00:00:00 2001 From: Johnny Willemsen Date: Thu, 2 Oct 2008 19:22:25 +0000 Subject: Thu Oct 2 19:20:45 UTC 2008 Johnny Willemsen --- TAO/ChangeLog | 21 +++++++++++++++++++++ TAO/performance-tests/Callback/client.cpp | 2 +- .../Latency/AMH_Single_Threaded/client.cpp | 2 +- TAO/performance-tests/Latency/DII/client.cpp | 2 +- TAO/performance-tests/Latency/DSI/client.cpp | 2 +- TAO/performance-tests/Latency/Deferred/client.cpp | 2 +- .../Latency/Single_Threaded/client.cpp | 2 +- .../POA/Create_Reference/create_reference.cpp | 2 +- .../POA/Implicit_Activation/client.cpp | 4 ++-- .../POA/Implicit_Activation/collocated.cpp | 4 ++-- TAO/performance-tests/Protocols/receiver.cpp | 2 +- TAO/performance-tests/Protocols/sender.cpp | 2 +- .../RTCorba/Thread_Pool/client.cpp | 4 ++-- .../Sequence_Latency/AMH_Single_Threaded/client.cpp | 12 ++++++------ .../Sequence_Latency/DII/client.cpp | 12 ++++++------ .../Sequence_Latency/DSI/client.cpp | 12 ++++++------ .../Sequence_Latency/Deferred/client.cpp | 12 ++++++------ .../Sequence_Latency/Single_Threaded/client.cpp | 12 ++++++------ 18 files changed, 66 insertions(+), 45 deletions(-) diff --git a/TAO/ChangeLog b/TAO/ChangeLog index b554efd418a..0f3ee7134e5 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,24 @@ +Thu Oct 2 19:20:45 UTC 2008 Johnny Willemsen + + * performance-tests/Callback/client.cpp + * performance-tests/Latency/AMH_Single_Threaded/client.cpp + * performance-tests/Latency/Deferred/client.cpp + * performance-tests/Latency/DII/client.cpp + * performance-tests/Latency/DSI/client.cpp + * performance-tests/Latency/Single_Threaded/client.cpp + * performance-tests/POA/Create_Reference/create_reference.cpp + * performance-tests/POA/Implicit_Activation/client.cpp + * performance-tests/POA/Implicit_Activation/collocated.cpp + * performance-tests/Protocols/receiver.cpp + * performance-tests/Protocols/sender.cpp + * performance-tests/RTCorba/Thread_Pool/client.cpp + * performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp + * performance-tests/Sequence_Latency/Deferred/client.cpp + * performance-tests/Sequence_Latency/DII/client.cpp + * performance-tests/Sequence_Latency/DSI/client.cpp + * performance-tests/Sequence_Latency/Single_Threaded/client.cpp + ACE_TCHAR fixes + Thu Oct 2 19:10:45 UTC 2008 Johnny Willemsen * orbsvcs/Concurrency_Service/Concurrency_Service.h diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index 12f2ca92334..ec8fe1f4791 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -162,7 +162,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) callback_i.sample_history (); if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp index cc1ac39afa9..4c83f7fbdea 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp @@ -133,7 +133,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index e5cb3cb862c..b98a49b3062 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -146,7 +146,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp index da07bcb30d0..25b08785708 100644 --- a/TAO/performance-tests/Latency/DSI/client.cpp +++ b/TAO/performance-tests/Latency/DSI/client.cpp @@ -132,7 +132,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp index e0c15e05ac2..6e53127e278 100644 --- a/TAO/performance-tests/Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Latency/Deferred/client.cpp @@ -173,7 +173,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp index cc1ac39afa9..4c83f7fbdea 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp @@ -133,7 +133,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index eeeba56ff04..7f19b9ee5fa 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -117,7 +117,7 @@ object_creation_test (PortableServer::POA_ptr poa, if (do_dump_history) { - creation.dump_samples ("HISTORY", gsf); + creation.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats creation_stats; diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp index c159a9952dc..adffd59c87d 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp @@ -124,7 +124,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - activation.dump_samples ("ACTIVATION_HISTORY", gsf); + activation.dump_samples (ACE_TEXT("ACTIVATION_HISTORY"), gsf); } ACE_Basic_Stats activation_stats; @@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - destruction.dump_samples ("DESTRUCTION_HISTORY", gsf); + destruction.dump_samples (ACE_TEXT("DESTRUCTION_HISTORY"), gsf); } ACE_Basic_Stats destruction_stats; diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index debc5eff093..86e019c4725 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -124,7 +124,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - activation.dump_samples ("ACTIVATION_HISTORY", gsf); + activation.dump_samples (ACE_TEXT("ACTIVATION_HISTORY"), gsf); } ACE_Basic_Stats activation_stats; @@ -147,7 +147,7 @@ ACE_TMAIN(int argc, ACE_TCHAR *argv[]) if (do_dump_history) { - destruction.dump_samples ("DESTRUCTION_HISTORY", gsf); + destruction.dump_samples (ACE_TEXT("DESTRUCTION_HISTORY"), gsf); } ACE_Basic_Stats destruction_stats; diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp index 7fc4fa22aaf..598f93f9b1d 100644 --- a/TAO/performance-tests/Protocols/receiver.cpp +++ b/TAO/performance-tests/Protocols/receiver.cpp @@ -172,7 +172,7 @@ test_i::end_test (void) if (do_dump_history) { - this->inter_arrival_times_->dump_samples ("Inter-arrival times", gsf); + this->inter_arrival_times_->dump_samples (ACE_TEXT("Inter-arrival times"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp index 76c6610f6ab..150b6449325 100644 --- a/TAO/performance-tests/Protocols/sender.cpp +++ b/TAO/performance-tests/Protocols/sender.cpp @@ -397,7 +397,7 @@ Worker::print_stats (void) { if (do_dump_history) { - this->history_.dump_samples ("HISTORY", gsf); + this->history_.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index 40ad83c4fc9..6100a42655f 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -537,7 +537,7 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end) if (do_dump_history) { - this->history_.dump_samples ("HISTORY", gsf); + this->history_.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -752,7 +752,7 @@ Continuous_Worker::print_stats (ACE_Sample_History &history, if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp index d4e73cdd813..36ba21efaae 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -110,7 +110,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -152,7 +152,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -194,7 +194,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -236,7 +236,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -278,7 +278,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -320,7 +320,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp index 1b5610826a9..660651776d9 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp @@ -124,7 +124,7 @@ test_octet_seq (const CORBA::Object_var object) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -172,7 +172,7 @@ test_long_seq (const CORBA::Object_var object) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -220,7 +220,7 @@ test_short_seq (const CORBA::Object_var object) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -268,7 +268,7 @@ test_char_seq (const CORBA::Object_var object) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -316,7 +316,7 @@ test_double_seq (const CORBA::Object_var object) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -364,7 +364,7 @@ test_longlong_seq (const CORBA::Object_var object) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index f17f6832f36..6f4cca6664a 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -109,7 +109,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -151,7 +151,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -194,7 +194,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -237,7 +237,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -280,7 +280,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -323,7 +323,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index 80e1efd0ca7..870b3ae95b0 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -151,7 +151,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -220,7 +220,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -289,7 +289,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -358,7 +358,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -427,7 +427,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -496,7 +496,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; diff --git a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp index fd6487a79ed..414011acb3b 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp @@ -109,7 +109,7 @@ test_octet_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -151,7 +151,7 @@ test_long_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -192,7 +192,7 @@ test_short_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -234,7 +234,7 @@ test_char_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -277,7 +277,7 @@ test_longlong_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; @@ -320,7 +320,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip) if (do_dump_history) { - history.dump_samples ("HISTORY", gsf); + history.dump_samples (ACE_TEXT("HISTORY"), gsf); } ACE_Basic_Stats stats; -- cgit v1.2.1