diff options
Diffstat (limited to 'TAO/performance-tests')
83 files changed, 147 insertions, 139 deletions
diff --git a/TAO/performance-tests/Anyop/anyop.cpp b/TAO/performance-tests/Anyop/anyop.cpp index 3777b0ed92e..efe1d379bcf 100644 --- a/TAO/performance-tests/Anyop/anyop.cpp +++ b/TAO/performance-tests/Anyop/anyop.cpp @@ -34,7 +34,7 @@ ACE_RCSID (Anyop, "$Id$") int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -55,7 +55,7 @@ main (int argc, char *argv[]) ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - ACE_Get_Opt get_opt (argc, argv, "dien:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dien:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp index ef0f50f3cc3..91ffb75cdac 100644 --- a/TAO/performance-tests/Callback/client.cpp +++ b/TAO/performance-tests/Callback/client.cpp @@ -48,7 +48,7 @@ private: }; int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -214,7 +214,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:k:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp index 81ae5c39bd0..17a66239fe4 100644 --- a/TAO/performance-tests/Callback/server.cpp +++ b/TAO/performance-tests/Callback/server.cpp @@ -17,7 +17,7 @@ const char *ior_file_name = "test.ior"; static int 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) @@ -144,7 +144,7 @@ main (int argc, char *argv []) int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp index a5db0ce0523..05185538e7d 100644 --- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp @@ -261,7 +261,7 @@ DII_Cubit_Client::init (int argc, char **argv) int DII_Cubit_Client::parse_args (void) { - ACE_Get_Opt opts (argc_, argv_, "dn:i:f:x"); + ACE_Get_Arg_Opt<char> opts (argc_, argv_, "dn:i:f:x"); int c; int result; @@ -849,7 +849,7 @@ DII_Cubit_Client::run (void) // Start the test. -int main (int argc, char *argv[]) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { DII_Cubit_Client cubit_client; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp index a1cb973c59d..fc622198ec4 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp @@ -216,7 +216,7 @@ Cubit_Client::read_ior (const char *filename) int Cubit_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "b:t:z:ovdn:f:k:xsq"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "b:t:z:ovdn:f:k:xsq"); int c = 0; int result = 0; u_int test_mask = 0; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp index 2d7ef27249d..da89e69eb6c 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp @@ -20,7 +20,7 @@ Cubit_Server::Cubit_Server (void) int Cubit_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "df:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "df:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc index fb8d3c5430a..4cdf7d539b9 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/IDL_Cubit.mpc @@ -11,6 +11,7 @@ project(*IDL): taoidldefaults, strategies { } project(*Server): taoexe, utils, portableserver, strategies { + exename = server after += *IDL Source_Files { @@ -28,6 +29,7 @@ project(*Server): taoexe, utils, portableserver, strategies { } project(*client): taoexe, portableserver, strategies { + exename = client after += *IDL Source_Files { diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp index 16fad32ff86..f00701de174 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/client.cpp @@ -19,7 +19,7 @@ ACE_RCSID(IDL_Cubit, client, "$Id$") // This function runs the client test. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp index 389f51d958d..740b4ae7174 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp @@ -73,9 +73,9 @@ svr_worker (void *arg) int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { - ACE_Get_Opt get_opts (argc, argv, "s:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:"); int c = -1; const char *client_cmd = 0; diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp index f28cd411ef0..896f08a847c 100644 --- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp @@ -25,7 +25,7 @@ ACE_RCSID(IDL_Cubit, server, "$Id$") // This runs the server test. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int priority = ACE_THR_PRI_FIFO_DEF; priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp index c8408545aac..dbc9deab6d7 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Globals.cpp @@ -26,7 +26,7 @@ Globals::Globals (void) int Globals::parse_args (int argc, char *argv[]) { - ACE_Get_Opt opts (argc, argv, "e:t:f:rm"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "e:t:f:rm"); int c; while ((c = opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc index d5cc27cdc06..8faec28172a 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/MT_Cubit.mpc @@ -9,6 +9,7 @@ project(*IDL): taoidldefaults, strategies { } project(*server): taoexe, utils, portableserver, strategies { + exename = server after += *IDL Source_Files { @@ -26,6 +27,7 @@ project(*server): taoexe, utils, portableserver, strategies { } project(*client): taoexe, utils, portableserver, strategies { + exename = client after += *IDL Source_Files { diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp index 876035b66dc..5f05114936d 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp @@ -59,7 +59,7 @@ Task_State::Task_State (void) int Task_State::parse_args (int argc,char *argv[]) { - ACE_Get_Opt opts (argc, argv, "mu:n:t:d:rxof:g:1cl"); + ACE_Get_Arg_Opt<char> opts (argc, argv, "mu:n:t:d:rxof:g:1cl"); int c; while ((c = opts ()) != -1) diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp index e0d97da8166..334d9a5e43d 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/client.cpp @@ -840,7 +840,7 @@ Client_i::do_thread_per_rate_test (void) // metrics and print them. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_Log_Msg::instance()->clr_flags (ACE_Log_Msg::LOGGER); diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp index 9235f275e82..e134d0daa3c 100644 --- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp +++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/server.cpp @@ -370,7 +370,7 @@ Server::start_servants (void) int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int result; diff --git a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp index 00a51f7de75..37fbacfd3b7 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/client.cpp @@ -20,7 +20,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -59,7 +59,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/performance-tests/Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/AMH_Single_Threaded/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp index ac678fc1a15..5ce43c9feb8 100644 --- a/TAO/performance-tests/Latency/AMI/client.cpp +++ b/TAO/performance-tests/Latency/AMI/client.cpp @@ -19,7 +19,7 @@ int niterations = 1000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:"); int c; while ((c = get_opts ()) != -1) @@ -50,7 +50,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/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp index 9aefa38f531..e32ae697223 100644 --- a/TAO/performance-tests/Latency/AMI/server.cpp +++ b/TAO/performance-tests/Latency/AMI/server.cpp @@ -16,7 +16,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:"); int c; while ((c = get_opts ()) != -1) @@ -45,7 +45,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/performance-tests/Latency/Collocation/Collocated_Test.cpp b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp index f4c6d4c2719..deb43edaebc 100644 --- a/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp +++ b/TAO/performance-tests/Latency/Collocation/Collocated_Test.cpp @@ -14,7 +14,7 @@ int niterations = 250000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:"); int c; while ((c = get_opts ()) != -1) @@ -59,7 +59,7 @@ set_priority() } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { //Use Real-time Scheduling class if possible set_priority(); diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp index 7bc5b0b292f..6ea7ad4547c 100644 --- a/TAO/performance-tests/Latency/DII/client.cpp +++ b/TAO/performance-tests/Latency/DII/client.cpp @@ -24,7 +24,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -62,7 +62,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/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Latency/DII/server.cpp +++ b/TAO/performance-tests/Latency/DII/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp index e4460d924b3..f7f6f6e1bc2 100644 --- a/TAO/performance-tests/Latency/DSI/client.cpp +++ b/TAO/performance-tests/Latency/DSI/client.cpp @@ -20,7 +20,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -58,7 +58,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/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp index e986310ab43..967c3737022 100644 --- a/TAO/performance-tests/Latency/DSI/server.cpp +++ b/TAO/performance-tests/Latency/DSI/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp index e7bd528901c..abf63e338ce 100644 --- a/TAO/performance-tests/Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Latency/Deferred/client.cpp @@ -30,7 +30,7 @@ int do_dump_history = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:b:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:b:"); int c; while ((c = get_opts ()) != -1) @@ -74,7 +74,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/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Latency/Deferred/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp index 00a51f7de75..37fbacfd3b7 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp @@ -20,7 +20,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -59,7 +59,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/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp index fcc91075b87..76995b229bd 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp @@ -18,7 +18,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +52,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/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp index 26f9ed145c8..3b08c934984 100644 --- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp index bb830e88a0f..9053276eed0 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp @@ -18,7 +18,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -52,7 +52,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/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp index 11acf78a42d..8bd983e6f69 100644 --- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp @@ -15,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +39,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/performance-tests/Memory/IORsize/client.cpp b/TAO/performance-tests/Memory/IORsize/client.cpp index f883c9d7749..87b90e674b6 100644 --- a/TAO/performance-tests/Memory/IORsize/client.cpp +++ b/TAO/performance-tests/Memory/IORsize/client.cpp @@ -12,7 +12,7 @@ static int n = 10; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:"); int c; while ((c = get_opts ()) != -1) @@ -40,7 +40,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Memory/IORsize/server.cpp b/TAO/performance-tests/Memory/IORsize/server.cpp index 712dafdf097..305de0b1de3 100644 --- a/TAO/performance-tests/Memory/IORsize/server.cpp +++ b/TAO/performance-tests/Memory/IORsize/server.cpp @@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Memory/Single_Threaded/client.cpp b/TAO/performance-tests/Memory/Single_Threaded/client.cpp index 50c39fc24fd..f5b2b16f7da 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/client.cpp @@ -10,7 +10,7 @@ static int n = 100; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Memory/Single_Threaded/server.cpp b/TAO/performance-tests/Memory/Single_Threaded/server.cpp index 712dafdf097..305de0b1de3 100644 --- a/TAO/performance-tests/Memory/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Memory/Single_Threaded/server.cpp @@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +37,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp index 356f3c6ecbb..58860694521 100644 --- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp +++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp @@ -21,7 +21,7 @@ ACE_UINT32 gsf; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:"); int c; while ((c = get_opts ()) != -1) @@ -131,7 +131,7 @@ object_creation_test (PortableServer::POA_ptr poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { set_rt_scheduling (); diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp index 9a013dadf0b..7ad8fd35061 100644 --- a/TAO/performance-tests/POA/Demux/client.cpp +++ b/TAO/performance-tests/POA/Demux/client.cpp @@ -22,7 +22,7 @@ ACE_RCSID(CodeGen, client, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Set TAO_debug_level to 0 to ensure silent running unless diff --git a/TAO/performance-tests/POA/Demux/demux_stats.cpp b/TAO/performance-tests/POA/Demux/demux_stats.cpp index fae7f9c0d20..d20dc2d7401 100644 --- a/TAO/performance-tests/POA/Demux/demux_stats.cpp +++ b/TAO/performance-tests/POA/Demux/demux_stats.cpp @@ -46,7 +46,7 @@ int Demux_Stats::parse_args (int argc_, char * argv_ []) { - ACE_Get_Opt get_opts (argc_, argv_, "i:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "i:"); int c; iterations = 0; @@ -337,7 +337,7 @@ if (iterations == 0) } int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { Demux_Stats demux_stats; diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp index 13816186585..dee326e1312 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp @@ -145,7 +145,7 @@ int Demux_Test_Client::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:m:n:o:p:i:s:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp index 308a59127c6..2518046b95f 100644 --- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp +++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp @@ -385,7 +385,7 @@ int Demux_Test_Server::parse_args (void) { - ACE_Get_Opt get_opts (this->argc_, this->argv_, "df:o:p:ut"); + ACE_Get_Arg_Opt<char> get_opts (this->argc_, this->argv_, "df:o:p:ut"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp index 629bb31cf5f..b45ccf5b9cd 100644 --- a/TAO/performance-tests/POA/Demux/server.cpp +++ b/TAO/performance-tests/POA/Demux/server.cpp @@ -22,7 +22,7 @@ ACE_RCSID(CodeGen, server, "$Id$") -int main (int argc, char *argv []) +int ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { // Set TAO_debug_level to 0 to ensure silent running unless // debugging is explicitly invoked diff --git a/TAO/performance-tests/POA/Demux/write_names.cpp b/TAO/performance-tests/POA/Demux/write_names.cpp index c5c9c8bfc77..9b7478779c9 100644 --- a/TAO/performance-tests/POA/Demux/write_names.cpp +++ b/TAO/performance-tests/POA/Demux/write_names.cpp @@ -2,7 +2,7 @@ #include <stdio.h> int -main(int argc, char* argv[]) +ACE_TMAIN(int argc, ACE_TCHAR* argv[]) { for(int i=0; i<1000; i++) diff --git a/TAO/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp index d3b7ab3d1e0..60cae56fe58 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp @@ -18,7 +18,7 @@ int do_shutdown = 1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -56,7 +56,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/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp index 562e77540ef..9e83b5ff22c 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp @@ -17,7 +17,7 @@ int do_dump_history = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "hi:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "hi:"); int c; while ((c = get_opts ()) != -1) @@ -46,7 +46,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/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp index 9f3699650df..e593e3c78e7 100644 --- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp +++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp @@ -13,7 +13,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -37,7 +37,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/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp index c3a276474ba..776bdcec6cf 100644 --- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp +++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp @@ -80,7 +80,7 @@ static u_long iterations = 1000; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "i:r"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:r"); int c; while ((c = get_opts ()) != -1) @@ -340,7 +340,7 @@ child_poa_testing (PortableServer::POA_ptr root_poa } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { ACE_DECLARE_NEW_CORBA_ENV; diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp index 11b369339f8..b9d1906a487 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp @@ -109,7 +109,7 @@ PP_Test_Client::read_ior (char *filename) int PP_Test_Client::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "ovdn:f:k:x"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "ovdn:f:k:x"); int c; int result; diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp index 593a4d3bdb7..e202209bab9 100644 --- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp +++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp @@ -15,7 +15,7 @@ PP_Test_Server::PP_Test_Server (void) int PP_Test_Server::parse_args (void) { - ACE_Get_Opt get_opts (argc_, argv_, "do:"); + ACE_Get_Arg_Opt<char> get_opts (argc_, argv_, "do:"); int c; while ((c = get_opts ()) != -1) diff --git a/TAO/performance-tests/Pluggable/client.cpp b/TAO/performance-tests/Pluggable/client.cpp index 40dabed1023..e59d5a9d1e0 100644 --- a/TAO/performance-tests/Pluggable/client.cpp +++ b/TAO/performance-tests/Pluggable/client.cpp @@ -8,7 +8,7 @@ ACE_RCSID(IDL_Cubit, client, "$Id$") // This function runs the client test. int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { PP_Test_Client pp_test_client; diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp index 6d781f12420..25bf5d42b94 100644 --- a/TAO/performance-tests/Pluggable/server.cpp +++ b/TAO/performance-tests/Pluggable/server.cpp @@ -8,7 +8,7 @@ ACE_RCSID(IDL_Cubit, server, "$Id$") // This runs the server test. int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { PP_Test_Server pp_test_server; diff --git a/TAO/performance-tests/Protocols/Protocols.mpc b/TAO/performance-tests/Protocols/Protocols.mpc index f5a235aa7de..184699b9899 100644 --- a/TAO/performance-tests/Protocols/Protocols.mpc +++ b/TAO/performance-tests/Protocols/Protocols.mpc @@ -36,6 +36,7 @@ project(*Distributor): rt_server { project(*Sender): rt_client { avoids += ace_for_tao after += *IDL + exename = sender specific (automake ) { includes += $(srcdir)/../../tests/RTCORBA/Diffserv diff --git a/TAO/performance-tests/Protocols/distributor.cpp b/TAO/performance-tests/Protocols/distributor.cpp index 5a7ad1c1735..0792320bad5 100644 --- a/TAO/performance-tests/Protocols/distributor.cpp +++ b/TAO/performance-tests/Protocols/distributor.cpp @@ -16,7 +16,7 @@ static int number_of_connection_attempts = 20; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "f:k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:k:"); int c; while ((c = get_opts ()) != -1) @@ -348,7 +348,7 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Protocols/receiver.cpp b/TAO/performance-tests/Protocols/receiver.cpp index 586fab9059b..42ff72185b2 100644 --- a/TAO/performance-tests/Protocols/receiver.cpp +++ b/TAO/performance-tests/Protocols/receiver.cpp @@ -17,7 +17,7 @@ static ACE_UINT32 gsf = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "d:f:m:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "d:f:m:"); int c; while ((c = get_opts ()) != -1) @@ -343,7 +343,7 @@ test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { gsf = ACE_High_Res_Timer::global_scale_factor (); diff --git a/TAO/performance-tests/Protocols/sender.cpp b/TAO/performance-tests/Protocols/sender.cpp index 5558f0abcee..6079f66f602 100644 --- a/TAO/performance-tests/Protocols/sender.cpp +++ b/TAO/performance-tests/Protocols/sender.cpp @@ -45,7 +45,7 @@ static Test_Type test_type = PACED; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:b:c:d:e:i:k:m:p:r:s:t:x:"); int c; while ((c = get_opts ()) != -1) @@ -678,7 +678,7 @@ Worker::run (ACE_ENV_SINGLE_ARG_DECL) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { gsf = ACE_High_Res_Timer::global_scale_factor (); diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp index 5a1b5a0af83..b6db32627d8 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp @@ -75,7 +75,7 @@ int priorities[MAX_THREADS]; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:t:n:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:t:n:p:"); int c; while ((c = get_opts ()) != -1) @@ -114,7 +114,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int policy = ACE_SCHED_FIFO; int flags = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp index d163ae4de46..e519cf3c333 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp @@ -52,7 +52,7 @@ const char *ior_output_file_base = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:t:"); int c; while ((c = get_opts ()) != -1) @@ -83,7 +83,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int policy = ACE_SCHED_FIFO; int flags = THR_NEW_LWP|THR_JOINABLE|THR_SCHED_FIFO|THR_BOUND; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp index d8094de1d7a..18823b9f315 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp @@ -75,7 +75,7 @@ int priorities[MAX_THREADS]; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "i:t:n:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "i:t:n:p:"); int c; while ((c = get_opts ()) != -1) @@ -114,7 +114,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int policy = ACE_SCHED_FIFO; int flags = THR_SCHED_FIFO|THR_NEW_LWP|THR_JOINABLE|THR_BOUND; diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp index a21dc9dc0c4..0093dab42d9 100644 --- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp +++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp @@ -11,7 +11,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -35,7 +35,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int policy = ACE_SCHED_FIFO; int priority = diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc index a05388566f9..81e994c44a9 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/Reliable.mpc @@ -8,6 +8,7 @@ project(*oneways idl RT): taoidldefaults { } project(*oneways server RT): rt_server, messaging, minimum_corba { + exename = server after += *oneways_idl_RT Source_Files { test_i.cpp @@ -20,6 +21,7 @@ project(*oneways server RT): rt_server, messaging, minimum_corba { } project(*oneways client RT): rt_client, messaging, minimum_corba { + exename = client after += *oneways_idl_RT Source_Files { testC.cpp diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp index f09a8e1343b..f2e8e93ba08 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp @@ -279,7 +279,7 @@ oneway_payload_test (Test_ptr server static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ps:k:i:t:l:m:w:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ps:k:i:t:l:m:w:x"); int error = 0; int c; @@ -421,7 +421,7 @@ set_rt_mode (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int result = set_rt_mode (); if (result != 0) diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp index f4b4b02b8d1..5876bf9db6f 100644 --- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp +++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp @@ -14,7 +14,7 @@ static const char *ior_output_file = "test.ior"; static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "f:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "f:"); int c; while ((c = get_opts ()) != -1) @@ -85,7 +85,7 @@ set_rt_mode (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { int result = set_rt_mode (); if (result != 0) diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp index d64f68b5139..e6d7516d49a 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp @@ -64,7 +64,7 @@ struct Synchronizers int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "c:e:g:hi:k:m:p:q:r:t:u:v:w:x:y:z:" //client options "b:f:hl:n:o:s:" // server options ); @@ -1161,7 +1161,7 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp index 07f49bbd3e0..aa644912fe9 100644 --- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp +++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp @@ -87,7 +87,7 @@ static const char *lanes_file = "empty-file"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:f:hl:n:o:s:" // server options "c:e:g:hi:j:k:m:p:q:r:t:u:v:w:x:y:z:" // client options ); @@ -419,7 +419,7 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { 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 18946dca23f..12b23ba0dfe 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/client.cpp @@ -23,7 +23,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -340,7 +340,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) 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/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp index a76449261c5..67d6beb26ed 100644 --- a/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMH_Single_Threaded/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Sequence_Latency/AMI/client.cpp b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp index c1343244eab..ca8fe52c671 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/client.cpp @@ -27,7 +27,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:k:i:"); int c; while ((c = get_opts ()) != -1) @@ -373,7 +373,7 @@ void test_longlong_seq (Test::Roundtrip_ptr roundtrip, // Main function starts below 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/performance-tests/Sequence_Latency/AMI/server.cpp b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp index 9aefa38f531..e32ae697223 100644 --- a/TAO/performance-tests/Sequence_Latency/AMI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/AMI/server.cpp @@ -16,7 +16,7 @@ int nthreads = 4; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:n:"); int c; while ((c = get_opts ()) != -1) @@ -45,7 +45,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/performance-tests/Sequence_Latency/DII/client.cpp b/TAO/performance-tests/Sequence_Latency/DII/client.cpp index 624c7ddfb6b..fe091c21188 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/client.cpp @@ -30,7 +30,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -391,7 +391,7 @@ test_longlong_seq (const CORBA::Object_var object ACE_ENV_ARG_DECL) // The main() function starts here 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/performance-tests/Sequence_Latency/DII/server.cpp b/TAO/performance-tests/Sequence_Latency/DII/server.cpp index f7ce55b8577..aba45587714 100644 --- a/TAO/performance-tests/Sequence_Latency/DII/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DII/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Sequence_Latency/DSI/client.cpp b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp index 8298ea4930b..e961019a151 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/client.cpp @@ -25,7 +25,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:"); int c; while ((c = get_opts ()) != -1) @@ -349,7 +349,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) 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/performance-tests/Sequence_Latency/DSI/server.cpp b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp index e986310ab43..967c3737022 100644 --- a/TAO/performance-tests/Sequence_Latency/DSI/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/DSI/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Sequence_Latency/Deferred/client.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp index b93bbd8ffbd..42218309dbc 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/client.cpp @@ -32,7 +32,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:hxk:i:b:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:hxk:i:b:"); int c; while ((c = get_opts ()) != -1) @@ -537,7 +537,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) // The main() function starts here 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/performance-tests/Sequence_Latency/Deferred/server.cpp b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp index 20ea98c2655..986dba26367 100644 --- a/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Deferred/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Sequence_Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp index 2352cf06b92..0b5161cd427 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/client.cpp @@ -23,7 +23,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "ht:xs:k:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "ht:xs:k:i:"); int c; while ((c = get_opts ()) != -1) @@ -344,7 +344,7 @@ test_double_seq (Test::Roundtrip_ptr roundtrip ACE_ENV_ARG_DECL) } 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/performance-tests/Sequence_Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp index b3f4e9e135d..6fbf15575e6 100644 --- a/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Single_Threaded/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp index af752262c0d..ea6bf756aef 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/client.cpp @@ -21,7 +21,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -74,7 +74,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/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp index 26f9ed145c8..3b08c934984 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Per_Connection/server.cpp @@ -14,7 +14,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -38,7 +38,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/performance-tests/Sequence_Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp index f12757f7de8..2bb99cb12fe 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/client.cpp @@ -21,7 +21,7 @@ const char *data_type = "octet"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t:s:xk:i:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t:s:xk:i:"); int c; while ((c = get_opts ()) != -1) @@ -73,7 +73,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/performance-tests/Sequence_Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp index 2f0ba140ea3..590c5046486 100644 --- a/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp +++ b/TAO/performance-tests/Sequence_Latency/Thread_Pool/server.cpp @@ -15,7 +15,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -39,7 +39,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/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp index 9d879e772d0..f690c2cdff7 100644 --- a/TAO/performance-tests/Throughput/client.cpp +++ b/TAO/performance-tests/Throughput/client.cpp @@ -16,7 +16,7 @@ int do_shutdown = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:b:i:n:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:b:i:n:x"); int c; while ((c = get_opts ()) != -1) @@ -59,7 +59,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp index 68afc375a0d..2470b9d4492 100644 --- a/TAO/performance-tests/Throughput/server.cpp +++ b/TAO/performance-tests/Throughput/server.cpp @@ -11,7 +11,7 @@ const char *ior_output_file = "test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:"); int c; while ((c = get_opts ()) != -1) @@ -34,7 +34,7 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { ACE_TRY_NEW_ENV { diff --git a/TAO/performance-tests/perf.mwc b/TAO/performance-tests/perf.mwc index dd297256b34..c4f1602ccc3 100644 --- a/TAO/performance-tests/perf.mwc +++ b/TAO/performance-tests/perf.mwc @@ -2,4 +2,5 @@ // $Id$ workspace { + cmdline += -base no_wchar } |