diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests')
11 files changed, 51 insertions, 51 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp index 0712a57e703..4794a2454ec 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp @@ -32,7 +32,7 @@ ACE_RCSID(TAO_PERF_RTEC_Colocated_Roundtrip, driver, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const CORBA::Long experiment_id = 1; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp index 0870f02aded..4fe176cf052 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -30,7 +30,7 @@ ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$") -const char *ior = "file://test.ior"; +const ACE_TCHAR *ior = ACE_TEXT ("file://test.ior"); int nthreads = 0; int high_priority_period = 0; int high_priority_workload = 0; @@ -63,7 +63,7 @@ private: }; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "k:n:l:h:w:v:zr"); int c; @@ -124,7 +124,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs(); RT_Class rt_class; @@ -164,7 +164,7 @@ int main (int argc, char *argv[]) ACE_DEBUG ((LM_DEBUG, "Finished peer configuration and activation\n")); CORBA::Object_var object = - orb->string_to_object (ior); + orb->string_to_object (ACE_TEXT_ALWAYS_CHAR (ior)); Federated_Test::Control_var control = Federated_Test::Control::_narrow (object.in ()); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp index f6194ba73dd..3cc046d687c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp @@ -18,7 +18,7 @@ ACE_RCSID (TAO_PERF_RTEC_Federated_Roundtrip, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int iterations = 10000; int nthreads = 1; int peer_count = 2; @@ -26,7 +26,7 @@ int do_dump_history = 0; int use_rt_corba = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "o:i:p:n:rd"); int c; @@ -76,7 +76,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp index 22ba06395b5..3dcb763f47d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp @@ -156,7 +156,7 @@ private: int workload_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp index aaf0be0d9be..389aa84e774 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp @@ -18,12 +18,12 @@ ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int use_rt_corba = 0; int nthreads = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "o:n:r"); int c; @@ -58,7 +58,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { /// Move the test to the real-time class if it is possible. RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp index 9d0e2bcea31..16775d9c59a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -180,7 +180,7 @@ private: int period_in_usecs_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { /// Move the test to the real-time class if it is possible. RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp index 81143039133..ada87d85c2f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp @@ -21,12 +21,12 @@ ACE_RCSID (TAO_PERF_RTEC_RTCORBA_Baseline, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int use_rt_corba = 0; int nthreads = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "o:n:r"); int c; @@ -61,7 +61,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { /// Move the test to the real-time class if it is possible. RT_Class rt_class; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp index bd774077776..03b2b09bb47 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/client.cpp @@ -29,7 +29,7 @@ ACE_RCSID(TAO_RTEC_PERF_Roundtrip, client, "$Id$") -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { const CORBA::Long experiment_id = 1; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp index 86f6fc8fe95..88c7bc85a35 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -23,12 +23,12 @@ ACE_RCSID (TAO_PERF_RTEC_Roundtrip, server, "$Id$") -const char *ior_output_file = "test.ior"; +const ACE_TCHAR *ior_output_file = ACE_TEXT ("test.ior"); int use_rt_corba = 0; int nthreads = 0; int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "o:n:r"); int c; @@ -63,7 +63,7 @@ parse_args (int argc, char *argv[]) return 0; } -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { TAO_EC_Default_Factory::init_svcs (); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp index ee18997a132..432af8fd712 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp @@ -19,16 +19,16 @@ ACE_RCSID (TAO_RTEC_PERF_TCP_Baseline, client, "$Id$") -char const * hi_endpoint = "localhost:12345"; -char const * lo_endpoint = "localhost:23456"; +char ACE_TCHAR *hi_endpoint = ACE_TEXT ("localhost:12345"); +char ACE_TCHAR *lo_endpoint = ACE_TEXT ("localhost:23456"); int -parse_args (int argc, char *argv[]); +parse_args (int argc, ACE_TCHAR *argv[]); class Scavenger_Task : public ACE_Task_Base { public: - Scavenger_Task (char const * endpoint, + Scavenger_Task (ACE_TCHAR const * endpoint, ACE_Barrier * the_barrier, int period_in_usecs); @@ -37,7 +37,7 @@ public: virtual int svc (); private: - char const * endpoint_; + ACE_TCHAR const * endpoint_; ACE_Barrier * the_barrier_; int period_in_usecs_; TAO_SYNCH_MUTEX mutex_; @@ -47,7 +47,7 @@ private: class Measuring_Task : public ACE_Task_Base { public: - Measuring_Task (char const * endpoint, + Measuring_Task (ACE_TCHAR const * endpoint, ACE_Barrier *the_barrier, int iterations, int period_in_usecs); @@ -57,13 +57,13 @@ public: ACE_Sample_History sample_history; private: - char const * endpoint_; + ACE_TCHAR const * endpoint_; ACE_Barrier * the_barrier_; int iterations_; int period_in_usecs_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { RT_Class rt_class; @@ -122,7 +122,7 @@ int main (int argc, char *argv[]) // **************************************************************** -Scavenger_Task::Scavenger_Task(char const * endpoint, +Scavenger_Task::Scavenger_Task(ACE_TCHAR const * endpoint, ACE_Barrier * the_barrier, int period_in_usecs) : endpoint_ (endpoint) @@ -194,14 +194,14 @@ Scavenger_Task::svc(void) // **************************************************************** -Measuring_Task::Measuring_Task (char const * endpoint, +Measuring_Task::Measuring_Task (ACE_TCHAR const * endpoint, ACE_Barrier * the_barrier, int iterations, int period_in_usecs) : sample_history (iterations) - , endpoint_(endpoint) - , the_barrier_(the_barrier) - , iterations_ (iterations) + , endpoint_ (endpoint) + , the_barrier_ (the_barrier) + , iterations_ (iterations) , period_in_usecs_ (period_in_usecs) { } @@ -233,12 +233,12 @@ Measuring_Task::svc () if (n == 0) { ACE_ERROR((LM_ERROR, "Connection closed while writing data to server <%s>\n", - endpoint_, "")); + endpoint_)); break; } else if (n == -1) { ACE_ERROR((LM_ERROR, "Error writing data to server <%s> %p\n", - endpoint_, "")); + endpoint_)); break; } if (n == 0 || n == -1) @@ -253,12 +253,12 @@ Measuring_Task::svc () if (n == 0) { ACE_ERROR((LM_ERROR, "Connection closed while reading data from server <%s>\n", - endpoint_, "")); + endpoint_)); break; } else if (n == -1) { ACE_ERROR((LM_ERROR, "Error reading data from server <%s> %p\n", - endpoint_, "")); + endpoint_)); break; } @@ -279,7 +279,7 @@ Measuring_Task::svc () } int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "H:L:"); int c; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp index dcbfac08567..98209718d75 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp @@ -17,26 +17,26 @@ ACE_RCSID (TAO_PERF_RTEC_TCP_Baseline, int use_rt = 0; int nthreads = 1; -char const * hi_endpoint = "localhost:12345"; -char const * lo_endpoint = "localhost:23456"; +ACE_TCHAR const * hi_endpoint = ACE_TEXT ("localhost:12345"); +ACE_TCHAR const * lo_endpoint = ACE_TEXT ("localhost:23456"); int -parse_args (int argc, char *argv[]); +parse_args (int argc, ACE_TCHAR *argv[]); class Task : public ACE_Task_Base { public: - Task(char const * endpoint); + Task (ACE_TCHAR const *endpoint); virtual int svc(); private: - char const * endpoint_; + ACE_TCHAR const *endpoint_; ACE_Reactor reactor_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { /// Move the test to the real-time class if it is possible. RT_Class rt_class; @@ -44,8 +44,8 @@ int main (int argc, char *argv[]) if (parse_args (argc, argv) != 0) return 1; - Task hi_task(hi_endpoint); - Task lo_task(lo_endpoint); + Task hi_task (hi_endpoint); + Task lo_task (lo_endpoint); hi_task.activate(rt_class.thr_sched_class() | THR_NEW_LWP | THR_JOINABLE, 1, 1, rt_class.priority_high()); @@ -139,11 +139,11 @@ Svc_Handler::handle_close(ACE_HANDLE h, ACE_Reactor_Mask m) // **************************************************************** -Task::Task(char const * endpoint) - : endpoint_(endpoint) - , reactor_(new ACE_TP_Reactor) +Task::Task(ACE_TCHAR const * endpoint) + : endpoint_ (endpoint) + , reactor_ (new ACE_TP_Reactor) { - ACE_INET_Addr local_sap(endpoint_); + ACE_INET_Addr local_sap (endpoint_); Acceptor * acceptor = new Acceptor; if(acceptor->open(local_sap, &reactor_, ACE_NONBLOCK) == -1) @@ -163,7 +163,7 @@ Task::svc() // **************************************************************** int -parse_args (int argc, char *argv[]) +parse_args (int argc, ACE_TCHAR *argv[]) { ACE_Get_Opt get_opts (argc, argv, "h:l:n:r"); int c; |