diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests')
19 files changed, 36 insertions, 33 deletions
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp index b68487ba367..b18f6af0567 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/client.cpp @@ -23,7 +23,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:n:r:"); int c; while ((c = get_opts ()) != -1) @@ -71,7 +71,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp index ed3756bffbe..b3e4d91970b 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/CPU/server.cpp @@ -22,7 +22,7 @@ int num_threads = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:r:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -236,7 +236,7 @@ join_object_group (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp index 94221caa7bd..77552424f3b 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/client.cpp @@ -23,7 +23,7 @@ int number; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:n:r:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:n:r:"); int c; while ((c = get_opts ()) != -1) @@ -72,7 +72,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp index f6ce3d00373..8b4fce4c59a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/server.cpp @@ -26,7 +26,7 @@ const char * strategy = "Random"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:r:c:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:r:c:d:"); int c; while ((c = get_opts ()) != -1) @@ -239,7 +239,7 @@ join_object_group (CORBA::ORB_ptr orb, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp index d8ebf631bdc..5df2011a298 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/compare_histo.cpp @@ -41,7 +41,7 @@ load_file (Vector &vector, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Vector X; load_file (X, argv[1]); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Colocated_Roundtrip/driver.cpp index 280e7ba2efa..993016d8b47 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 8720b8bb599..81b2d8a34cc 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/client.cpp @@ -69,7 +69,7 @@ private: int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:l:h:w:v:zr"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:l:h:w:v:zr"); int c; while ((c = get_opts ()) != -1) @@ -128,7 +128,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; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp index 677cf6870f5..c188ce43e8b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Federated_Roundtrip/server.cpp @@ -28,7 +28,7 @@ int use_rt_corba = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:i:p:n:rd"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:i:p:n:rd"); int c; while ((c = get_opts ()) != -1) @@ -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 a3caafe3b54..ab1160e9c6b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/client.cpp @@ -163,7 +163,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 f82199ba24e..de661a6263b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Baseline/server.cpp @@ -25,7 +25,7 @@ int nthreads = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r"); int c; while ((c = get_opts ()) != -1) @@ -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 420b6d15b95..f3612f5f197 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/client.cpp @@ -193,7 +193,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 59d0eb001d2..71effbf4fea 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/RTCORBA_Callback/server.cpp @@ -28,7 +28,7 @@ int nthreads = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r"); int c; while ((c = get_opts ()) != -1) @@ -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 5e723b3cca5..f9e1d7b1974 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 8c7d83af31a..75f79000853 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/Roundtrip/server.cpp @@ -30,7 +30,7 @@ int nthreads = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:r"); int c; while ((c = get_opts ()) != -1) @@ -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 8c36cbd0349..2186d839335 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/client.cpp @@ -62,7 +62,7 @@ private: int period_in_usecs_; }; -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { RT_Class rt_class; @@ -280,7 +280,7 @@ Measuring_Task::svc () int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "H:L:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "H:L:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp index dcbfac08567..2670a938df5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/TCP_Baseline/server.cpp @@ -36,7 +36,7 @@ private: 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; @@ -165,7 +165,7 @@ Task::svc() int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "h:l:n:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "h:l:n:r"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp index a48dbed7cda..474470fe48d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.cpp @@ -32,7 +32,7 @@ Client_Options::Client_Options (int &argc, char *argv[]) , funky_supplier_publication (0) , high_priority_is_last (0) { - ACE_Arg_Shifter arg_shifter (argc, argv); + ACE_TArg_Shifter<char> arg_shifter (argc, argv); while (arg_shifter.is_anything_left ()) { @@ -72,7 +72,7 @@ Client_Options::Client_Options (int &argc, char *argv[]) } int -Client_Options::option (ACE_Arg_Shifter &arg_shifter, +Client_Options::option (ACE_TArg_Shifter<char> &arg_shifter, const char *option_name, int &option_value) { @@ -93,7 +93,7 @@ Client_Options::option (ACE_Arg_Shifter &arg_shifter, } int -Client_Options::boolean_option (ACE_Arg_Shifter &arg_shifter, +Client_Options::boolean_option (ACE_TArg_Shifter<char> &arg_shifter, const char *option_name, int &option_value) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h index cbffa42aeb7..677d68719d5 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Options.h @@ -12,13 +12,14 @@ #include /**/ "ace/pre.h" #include "rtec_perf_export.h" +#include "ace/Arg_Shifter.h" #if !defined (ACE_LACKS_PRAGMA_ONCE) # pragma once #endif /* ACE_LACKS_PRAGMA_ONCE */ ACE_BEGIN_VERSIONED_NAMESPACE_DECL -class ACE_Arg_Shifter; +//class ACE_TArg_Shifter<char>; ACE_END_VERSIONED_NAMESPACE_DECL /// Parse the command-line client_options for the tests. @@ -49,11 +50,11 @@ public: int high_priority_is_last; private: - int option (ACE_Arg_Shifter &arg_shifter, + int option (ACE_TArg_Shifter<char> &arg_shifter, const char *option_name, int &option_value); - int boolean_option (ACE_Arg_Shifter &arg_shifter, + int boolean_option (ACE_TArg_Shifter<char> &arg_shifter, const char *option_name, int &option_value); }; diff --git a/TAO/orbsvcs/performance-tests/perf.mwc b/TAO/orbsvcs/performance-tests/perf.mwc index dd297256b34..b11bf5da603 100644 --- a/TAO/orbsvcs/performance-tests/perf.mwc +++ b/TAO/orbsvcs/performance-tests/perf.mwc @@ -2,4 +2,6 @@ // $Id$ workspace { + cmdline += -base no_wchar } + |