diff options
Diffstat (limited to 'TAO/tests/RTCORBA')
72 files changed, 283 insertions, 1109 deletions
diff --git a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp index 8dd1103b673..5e4f933adbb 100644 --- a/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp +++ b/TAO/tests/RTCORBA/Activate_Object_Multiple_ORBs/test.cpp @@ -21,7 +21,7 @@ public: }; -int main(int, char**) +int ACE_TMAIN(int, ACE_TCHAR**) { ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY diff --git a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc index b62ff14a3d9..78e08a31786 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc +++ b/TAO/tests/RTCORBA/Banded_Connections/RTCORBA_Banded_Conn.mpc @@ -8,7 +8,6 @@ project(*Server): rt_server { } project(*Client): rt_client { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Banded_Connections/client.cpp b/TAO/tests/RTCORBA/Banded_Connections/client.cpp index 248fb4b0f2e..db79df757f8 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/client.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/ORB_Core.h" #include "../check_supported_priorities.cpp" @@ -14,7 +15,7 @@ const char *ior2 = "file://test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "n:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "n:o:"); int c; while ((c = get_opts ()) != -1) @@ -314,22 +315,23 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl index 20bd0533f96..ab526f9b9d9 100755 --- a/TAO/tests/RTCORBA/Banded_Connections/run_test.pl +++ b/TAO/tests/RTCORBA/Banded_Connections/run_test.pl @@ -50,7 +50,7 @@ else { $CL = new PerlACE::Process ("client", "-n file://$iorfile1 -o file://$iorfile2"); $SV->Spawn(); -if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1) +if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) { $server = $SV->TimedWait (1); if ($server == 2) diff --git a/TAO/tests/RTCORBA/Banded_Connections/server.cpp b/TAO/tests/RTCORBA/Banded_Connections/server.cpp index b45fef9cba9..deac22c02b8 100644 --- a/TAO/tests/RTCORBA/Banded_Connections/server.cpp +++ b/TAO/tests/RTCORBA/Banded_Connections/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/Read_Buffer.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" @@ -134,7 +135,7 @@ const char *ior_output_file2 = "test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "b:o:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:o:n:"); int c; while ((c = get_opts ()) != -1) @@ -174,7 +175,7 @@ get_priority_bands (RTCORBA::PriorityBands &bands) // Read bands from a file. // FILE* file = - ACE_OS::fopen (bands_file, "r"); + ACE_OS::fopen (bands_file, ACE_TEXT("r")); if (file == 0) return -1; @@ -257,7 +258,7 @@ create_object (PortableServer::POA_ptr poa, if (filename != 0) { FILE *output_file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -344,24 +345,25 @@ poa_creation_exception_test (PortableServer::POA_ptr root_poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + CORBA::ORB_var orb; ACE_TRY_NEW_ENV { // Initialize ORB. orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. int result = - parse_args (argc, - argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc index 9f0ce92c6ea..23d288d93b3 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc +++ b/TAO/tests/RTCORBA/Client_Propagated/RTCORBA_Client_Propagated.mpc @@ -8,7 +8,6 @@ project(*Server): rt_server { } project(*Client): rt_client, interceptors { - after += *Server Source_Files { testC.cpp interceptors.cpp diff --git a/TAO/tests/RTCORBA/Client_Propagated/client.cpp b/TAO/tests/RTCORBA/Client_Propagated/client.cpp index dc1fe8657cd..26baadf06fb 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/client.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/client.cpp @@ -8,6 +8,7 @@ #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTCORBA/Priority_Mapping_Manager.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "../check_supported_priorities.cpp" const char *ior = "file://test.ior"; @@ -15,7 +16,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -188,8 +189,10 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Register the interceptors to check for the RTCORBA @@ -208,10 +211,10 @@ main (int argc, char *argv[]) // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/Client_Propagated/server.cpp b/TAO/tests/RTCORBA/Client_Propagated/server.cpp index 463429c1312..c2e235e93b3 100644 --- a/TAO/tests/RTCORBA/Client_Propagated/server.cpp +++ b/TAO/tests/RTCORBA/Client_Propagated/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -85,7 +86,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) @@ -200,7 +201,7 @@ Task::svc (void) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -253,18 +254,20 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Standard initialization: // parse arguments and get all the references (ORB, // RootPOA, RTORB, RTCurrent, POAManager). CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc index e51a077e7fe..596601d6e07 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc +++ b/TAO/tests/RTCORBA/Client_Protocol/RTCORBA_Client_Protocol.mpc @@ -8,7 +8,6 @@ project(*Server): strategies, rt_server { } project(*Client): strategies, rt_client { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Client_Protocol/client.cpp b/TAO/tests/RTCORBA/Client_Protocol/client.cpp index 2ef31055c8f..f72f52a5388 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/Strategies/advanced_resource.h" @@ -14,7 +15,7 @@ CORBA::ULong protocol_type = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "s:c:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:p:"); int c, result; while ((c = get_opts ()) != -1) @@ -87,19 +88,21 @@ exception_test (Test_ptr server, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, resolve references and parse arguments. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl index 9b548f0ff8b..353569681aa 100755 --- a/TAO/tests/RTCORBA/Client_Protocol/run_test.pl +++ b/TAO/tests/RTCORBA/Client_Protocol/run_test.pl @@ -48,7 +48,7 @@ $CL = new PerlACE::Process ("client", $client_args); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile2, $PerlACE::wait_interval_for_process_creation) == -1) { +if (PerlACE::waitforfile_timed ($iorfile2, 10) == -1) { print STDERR "ERROR: cannot find file <$iorfile2>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/RTCORBA/Client_Protocol/server.cpp b/TAO/tests/RTCORBA/Client_Protocol/server.cpp index 6b4cc59125f..d8d8a93df56 100644 --- a/TAO/tests/RTCORBA/Client_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Client_Protocol/server.cpp @@ -2,6 +2,7 @@ #include "testS.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTCORBA/RT_Policy_i.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -59,7 +60,7 @@ CORBA::ULong protocol_type = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "s:c:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:p:"); int c, result; while ((c = get_opts ()) != -1) @@ -137,7 +138,7 @@ create_object (PortableServer::POA_ptr poa, // Print ior to the file. if (filename != 0) { - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -151,17 +152,19 @@ create_object (PortableServer::POA_ptr poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Collocation/Collocation.cpp b/TAO/tests/RTCORBA/Collocation/Collocation.cpp index fa40bd0ca34..4d0803b8e08 100644 --- a/TAO/tests/RTCORBA/Collocation/Collocation.cpp +++ b/TAO/tests/RTCORBA/Collocation/Collocation.cpp @@ -3,6 +3,7 @@ #include "ace/Get_Opt.h" #include "ace/Array_Base.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" #include "testS.h" @@ -916,13 +917,15 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp index ed68835f061..3f5810bc95b 100644 --- a/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp +++ b/TAO/tests/RTCORBA/Destroy_Thread_Pool/Destroy_Thread_Pool.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB.h" #include "tao/RTCORBA/RTCORBA.h" @@ -19,7 +20,7 @@ static int iterations = 5; int 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; while ((c = get_opts ()) != -1) @@ -89,13 +90,15 @@ create_threadpool_with_lanes (RTCORBA::RTORB_ptr rt_orb } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; @@ -125,7 +128,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc index 85cadf3219a..7138aa20720 100644 --- a/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc +++ b/TAO/tests/RTCORBA/Diffserv/RTCORBA_Diffserv.mpc @@ -9,7 +9,6 @@ project(*client) : taoexe, portableserver, rtcorba, minimum_corba { } project(*server) : taoexe, rtportableserver, rtcorba, minimum_corba { - after += *client source_files { server.cpp Custom_Network_Priority_Mapping.cpp diff --git a/TAO/tests/RTCORBA/Diffserv/client.cpp b/TAO/tests/RTCORBA/Diffserv/client.cpp index 1956eb1e5ac..a7c39a1d357 100644 --- a/TAO/tests/RTCORBA/Diffserv/client.cpp +++ b/TAO/tests/RTCORBA/Diffserv/client.cpp @@ -6,6 +6,7 @@ #include "tao/RTCORBA/Network_Priority_Mapping.h" #include "Custom_Network_Priority_Mapping.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Policy_Manager.h" static const char *ior = "file://simple_servant.ior"; @@ -130,7 +131,7 @@ change_network_priority (int enable_network_priority, int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:n:p:x:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:n:p:x:"); int c; while ((c = get_opts ()) != -1) @@ -183,15 +184,17 @@ toggle (int &i) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Initialize and obtain reference to the Test object. diff --git a/TAO/tests/RTCORBA/Diffserv/server.cpp b/TAO/tests/RTCORBA/Diffserv/server.cpp index cee01e1b4f7..6acc390f714 100644 --- a/TAO/tests/RTCORBA/Diffserv/server.cpp +++ b/TAO/tests/RTCORBA/Diffserv/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "tao/RTCORBA/Network_Priority_Mapping_Manager.h" @@ -52,7 +53,7 @@ static RTCORBA::Priority corba_priority = RTCORBA::minPriority; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:"); int c; while ((c = get_opts ()) != -1) @@ -97,26 +98,28 @@ create_object (PortableServer::POA_ptr poa, orb->object_to_string (object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::Object_var object; // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RootPOA. diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README deleted file mode 100644 index 95b07c46c2c..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/README +++ /dev/null @@ -1,10 +0,0 @@ -$Id$ - -Description: -This is a simple test for a RT thread-pool server. It creates a -server process with multiple thread pools, POAs, and servants. The -test also spawns multiple clients for each servant. The servants with -multiple threads in their thread-pool respond faster than the servants -with a single thread thread-pool. - -See run_test.pl to see how to run this test.
\ No newline at end of file diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc deleted file mode 100644 index ebf79370785..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/RT_Dynamic_Thread_Pool.mpc +++ /dev/null @@ -1,18 +0,0 @@ -// -*- MPC -*- -// $Id$ - -project(*Server): strategies, rt_server, minimum_corba { - Source_Files { - test_i.cpp - server.cpp - } -} - -project(*Client): strategies, rt_client, minimum_corba { - after += *Server - Source_Files { - testC.cpp - client.cpp - } -} - diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp deleted file mode 100644 index abe1dd456ec..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/client.cpp +++ /dev/null @@ -1,225 +0,0 @@ -// $Id$ - -#include "ace/Get_Opt.h" -#include "testC.h" -#include "tao/RTCORBA/RTCORBA.h" -#include "tao/ORB_Core.h" -#include "ace/Task.h" -#include "ace/OS_NS_unistd.h" - #include "../check_supported_priorities.cpp" - -ACE_RCSID(Thread_Pool, client, "$Id$") - -const char *ior = "file://ior_1"; -int iterations = 6; -int shutdown_server = 0; -bool decreased = false; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "xk:i:"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'x': - shutdown_server = 1; - break; - - case 'k': - ior = get_opts.opt_arg (); - break; - - case 'i': - iterations = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case '?': - default: - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-k <ior> " - "-i <iterations> " - "-x [shutdown server] " - "\n", - argv [0]), - -1); - } - - // Indicates sucessful parsing of the command line - return 0; -} - -class Task : public ACE_Task_Base -{ -public: - - Task (ACE_Thread_Manager &thread_manager, - CORBA::ORB_ptr orb); - - int svc (void); - - CORBA::ORB_var orb_; - -}; - -Task::Task (ACE_Thread_Manager &thread_manager, - CORBA::ORB_ptr orb) - : ACE_Task_Base (&thread_manager), - orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -int -Task::svc (void) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var object = - this->orb_->string_to_object (ior ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - test_var test = - test::_narrow (object.in () ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - pid_t pid = - ACE_OS::getpid (); - - CORBA::Long tc = 0; - - for (int i = 0; i != iterations; ++i) - { - CORBA::Long mtc = 0; - CORBA::Long r = - test->method (pid, - i, - mtc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - // Each 2 iterations sleep 5 seconds - if (i % 2 == 0) - ACE_OS::sleep (5); - - ACE_ASSERT (r == i); - // Assert disappears on with optimizations on. - ACE_UNUSED_ARG (r); - - if (mtc > tc) - { - // Number of threads increased, so store this. - ACE_DEBUG ((LM_DEBUG, "Thread count increased to %d\n", mtc)); - tc = mtc; - } - else if (mtc < tc) - { - // Number of threads decreased! - ACE_DEBUG ((LM_DEBUG, "Thread count decreased to %d\n", mtc)); - decreased = true; - tc = mtc; - } - } - - ACE_OS::sleep (10); - - CORBA::Long end = 0; - CORBA::Long re = - test->method (pid, - 0, - end - ACE_ENV_ARG_PARAMETER); - - ACE_ASSERT (re == 0); - // Assert disappears on with optimizations on. - ACE_UNUSED_ARG (re); - - if (end != 0) - { - ACE_ERROR ((LM_ERROR, "Dynamic thread count should be 0, not %d\n", end)); - } - - if (shutdown_server) - { - test->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - return -1; - } - ACE_ENDTRY; - - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - int result = - parse_args (argc, argv); - if (result != 0) - return result; - - // Thread Manager for managing task. - ACE_Thread_Manager thread_manager; - - // Create task. - Task task (thread_manager, - orb.in ()); - - // Task activation flags. - long flags = - THR_NEW_LWP | - THR_JOINABLE | - orb->orb_core ()->orb_params ()->thread_creation_flags (); - - // Activate task. - result = - task.activate (flags); - if (result == -1) - { - if (errno == EPERM) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot create thread with scheduling policy %s\n" - "because the user does not have the appropriate privileges, terminating program....\n" - "Check svc.conf options and/or run as root\n", - sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), - 2); - } - else - // Unexpected error. - ACE_ASSERT (0); - } - - // Wait for task to exit. - result = - thread_manager.wait (); - ACE_ASSERT (result != -1); - - if (decreased == false) - { - ACE_ERROR_RETURN ((LM_ERROR, "ERROR: Number of threads didn't decrease\n"), -1); - } - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); - return -1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf deleted file mode 100644 index 41c1919a08a..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf +++ /dev/null @@ -1,2 +0,0 @@ -# Option for platforms where direct mapping doesn't work -static RT_ORB_Loader "-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000" diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml deleted file mode 100644 index bbb864e64b0..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/continuous.conf.xml +++ /dev/null @@ -1,6 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from continuous.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <!-- Option for platforms where direct mapping doesn't work --> - <static id="RT_ORB_Loader" params="-ORBPriorityMapping continuous -RTORBDynamicThreadIdleTimeout 1000000"/> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl deleted file mode 100644 index 2059c01b04f..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/run_test.pl +++ /dev/null @@ -1,117 +0,0 @@ -eval '(exit $?0)' && eval 'exec perl -S $0 ${1+"$@"}' - & eval 'exec perl -S $0 $argv:q' - if 0; - -# $Id$ -# -*- perl -*- - -use lib '../../../../bin'; -use PerlACE::Run_Test; - -$number_of_clients = 1; -$status = 0; -$continuous = ($^O eq 'hpux'); - -@configurations = - ( - { - file => "ior_3", - description => "Invoking methods on servant in second RT thread pool (with lanes)", - }, - ); - -for $test (@configurations) -{ - unlink $test->{file}; -} - -sub run_clients -{ - my @parms = @_; - $arg = $parms[0]; - $clients = $parms[1]; - - for ($i = 0; $i < $clients; $i++) - { - $CL[$i] = new PerlACE::Process ("client", $arg); - $CL[$i]->Spawn (); - } - - for ($i = 0; $i < $clients; $i++) - { - $client = $CL[$i]->WaitKill (120); - if ($client != 0) - { - print STDERR "ERROR: client returned $client\n"; - $status = 1; - goto kill_server; - } - } -} - -if (PerlACE::is_vxworks_test()) { - $SV = new PerlACE::ProcessVX ("server"); -} -else { - $SV = new PerlACE::Process ("server"); -} - -if ($continuous) { - $SV->Arguments ("-ORBSvcConf continuous$PerlACE::svcconf_ext"); -} - $SV->Arguments ("-ORBDebugLevel 10 -ORBLogFile server.log"); - -$SV->Spawn (); - -for $test (@configurations) -{ - if (PerlACE::waitforfile_timed ($test->{file}, 10) == -1) - { - $server = $SV->TimedWait (1); - if ($server == 2) - { - # Mark as no longer running to avoid errors on exit. - $SV->{RUNNING} = 0; - exit $status; - } - else - { - print STDERR "ERROR: cannot find ior file: $test->{file}\n"; - $status = 1; - goto kill_server; - } - } - } - -for $test (@configurations) - { - print STDERR "\n*************************************************************\n"; - print STDERR "$test->{description}\n"; - print STDERR "*************************************************************\n\n"; - - run_clients ("-k file://".PerlACE::LocalFile($test->{file}), $number_of_clients); - } - -print STDERR "\n************************\n"; -print STDERR "Shutting down the server\n"; -print STDERR "************************\n\n"; - -run_clients ("-k file://".PerlACE::LocalFile($configurations[0]->{file})." -i 0 -x", 1); - -kill_server: - -$server = $SV->WaitKill (5); - -if ($server != 0) - { - print STDERR "ERROR: server returned $server\n"; - $status = 1; - } - -for $test (@configurations) - { - unlink $test->{file}; - } - -exit $status - diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp deleted file mode 100644 index ea5dc6db558..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/server.cpp +++ /dev/null @@ -1,397 +0,0 @@ -// $Id$ - -#include "test_i.h" -#include "ace/Get_Opt.h" -#include "ace/OS_NS_unistd.h" -#include "tao/ORB_Core.h" -#include "ace/Task.h" -#include "tao/RTPortableServer/RTPortableServer.h" -#include "../check_supported_priorities.cpp" - -ACE_RCSID(Thread_Pool, server, "$Id$") - -const char *ior_output_file = "ior"; -int ior_count = 1; -CORBA::ULong static_threads = 1; -CORBA::ULong dynamic_threads = 25; -long nap_time = 1000; - -int -parse_args (int argc, char *argv[]) -{ - ACE_Get_Opt get_opts (argc, argv, "o:s:d:t:h"); - int c; - - while ((c = get_opts ()) != -1) - switch (c) - { - case 'o': - ior_output_file = get_opts.opt_arg (); - break; - - case 's': - static_threads = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case 'd': - dynamic_threads = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case 't': - nap_time = ACE_OS::atoi (get_opts.opt_arg ()); - break; - - case 'h': - ACE_ERROR_RETURN ((LM_ERROR, - "usage: %s " - "-o <iorfile> " - "-s <static_threads> " - "-d <dynamic_threads> " - "-t <nap_time> " - "\n", - argv [0]), - -1); - } - - // Indicates sucessful parsing of the command line - return 0; -} - -int -write_ior_to_file (CORBA::ORB_ptr orb, - test_ptr test - ACE_ENV_ARG_DECL) -{ - CORBA::String_var ior = - orb->object_to_string (test - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - char filename[BUFSIZ]; - ACE_OS::sprintf (filename, - "%s_%d", - ior_output_file, - ior_count++); - - FILE *output_file = - ACE_OS::fopen (filename, - "w"); - - if (output_file == 0) - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot open output file for writing IOR: %s", - filename), - -1); - - ACE_OS::fprintf (output_file, - "%s", - ior.in ()); - - ACE_OS::fclose (output_file); - - return 0; -} - -int -create_POA_and_register_servant (CORBA::Policy_ptr threadpool_policy, - const char *poa_name, - PortableServer::POAManager_ptr poa_manager, - PortableServer::POA_ptr root_poa, - CORBA::ORB_ptr orb, - RTCORBA::RTORB_ptr rt_orb - ACE_ENV_ARG_DECL) -{ - // Policies for the firstPOA to be created. - CORBA::PolicyList policies (3); policies.length (3); - - // Implicit_activation policy. - policies[0] = - root_poa->create_implicit_activation_policy - (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - // Thread pool policy. - policies[1] = - CORBA::Policy::_duplicate (threadpool_policy); - - // Priority Model policy. - policies[2] = - rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - 0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - // Create the POA under the RootPOA. - PortableServer::POA_var poa = - root_poa->create_POA (poa_name, - poa_manager, - policies - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - // Creation of POAs is over. Destroy the Policy objects. - for (CORBA::ULong i = 0; - i < policies.length (); - ++i) - { - policies[i]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - } - - test_i *servant = - new test_i (orb, - poa.in (), - nap_time); - - PortableServer::ServantBase_var safe_servant (servant); - ACE_UNUSED_ARG (safe_servant); - - test_var test = - servant->_this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - int result = - write_ior_to_file (orb, - test.in () - ACE_ENV_ARG_PARAMETER); - ACE_CHECK_RETURN (-1); - - return result; -} - -class Task : public ACE_Task_Base -{ -public: - - Task (ACE_Thread_Manager &thread_manager, - CORBA::ORB_ptr orb); - - int svc (void); - - CORBA::ORB_var orb_; - -}; - -Task::Task (ACE_Thread_Manager &thread_manager, - CORBA::ORB_ptr orb) - : ACE_Task_Base (&thread_manager), - orb_ (CORBA::ORB::_duplicate (orb)) -{ -} - -int -Task::svc (void) -{ - ACE_TRY_NEW_ENV - { - CORBA::Object_var object = - this->orb_->resolve_initial_references ("RootPOA" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - object = - this->orb_->resolve_initial_references ("RTORB" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - RTCORBA::RTORB_var rt_orb = - RTCORBA::RTORB::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - object = - this->orb_->resolve_initial_references ("RTCurrent" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - RTCORBA::Current_var current = - RTCORBA::Current::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - RTCORBA::Priority default_thread_priority = - current->the_priority (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - test_i servant (this->orb_.in (), - root_poa.in (), - nap_time); - test_var test = - servant._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - int result = - write_ior_to_file (this->orb_.in (), - test.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - if (result != 0) - return result; - - poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::ULong stacksize = 0; - CORBA::Boolean allow_request_buffering = 0; - CORBA::ULong max_buffered_requests = 0; - CORBA::ULong max_request_buffer_size = 0; - - RTCORBA::ThreadpoolId threadpool_id_1 = - rt_orb->create_threadpool (stacksize, - static_threads, - dynamic_threads, - default_thread_priority, - allow_request_buffering, - max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Policy_var threadpool_policy_1 = - rt_orb->create_threadpool_policy (threadpool_id_1 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Boolean allow_borrowing = 0; - RTCORBA::ThreadpoolLanes lanes (1); - lanes.length (1); - - lanes[0].lane_priority = default_thread_priority; - lanes[0].static_threads = static_threads; - lanes[0].dynamic_threads = dynamic_threads; - - RTCORBA::ThreadpoolId threadpool_id_2 = - rt_orb->create_threadpool_with_lanes (stacksize, - lanes, - allow_borrowing, - allow_request_buffering, - max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CORBA::Policy_var threadpool_policy_2 = - rt_orb->create_threadpool_policy (threadpool_id_2 - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - result = - create_POA_and_register_servant (threadpool_policy_1.in (), - "first_poa", - poa_manager.in (), - root_poa.in (), - this->orb_.in (), - rt_orb.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - if (result != 0) - return result; - - result = - create_POA_and_register_servant (threadpool_policy_2.in (), - "second_poa", - poa_manager.in (), - root_poa.in (), - this->orb_.in (), - rt_orb.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - if (result != 0) - return result; - - this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - - this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception caught:"); - return -1; - } - ACE_ENDTRY; - - return 0; -} - -int -main (int argc, char *argv[]) -{ - ACE_TRY_NEW_ENV - { - CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, - "" - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - int result = - parse_args (argc, argv); - if (result != 0) - return result; - - // Make sure we can support multiple priorities that are required - // for this test. - if (!check_supported_priorities (orb.in ())) - return 2; - - // Thread Manager for managing task. - ACE_Thread_Manager thread_manager; - - // Create task. - Task task (thread_manager, - orb.in ()); - - // Task activation flags. - long flags = - THR_NEW_LWP | - THR_JOINABLE | - orb->orb_core ()->orb_params ()->thread_creation_flags (); - - // Activate task. - result = - task.activate (flags); - if (result == -1) - { - if (errno == EPERM) - { - ACE_ERROR_RETURN ((LM_ERROR, - "Cannot create thread with scheduling policy %s\n" - "because the user does not have the appropriate privileges, terminating program....\n" - "Check svc.conf options and/or run as root\n", - sched_policy_name (orb->orb_core ()->orb_params ()->ace_sched_policy ())), - 2); - } - else - // Unexpected error. - ACE_ASSERT (0); - } - - // Wait for task to exit. - result = - thread_manager.wait (); - ACE_ASSERT (result != -1); - } - ACE_CATCHANY - { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Exception caught"); - return -1; - } - ACE_ENDTRY; - - return 0; -} diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf deleted file mode 100644 index c288d674567..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf +++ /dev/null @@ -1 +0,0 @@ -static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 1000000" diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml deleted file mode 100644 index 0908328040b..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/svc.conf.xml +++ /dev/null @@ -1,5 +0,0 @@ -<?xml version='1.0'?> -<!-- Converted from svc.conf by svcconf-convert.pl --> -<ACE_Svc_Conf> - <static RT_ORB_Loader "-RTORBDynamicThreadIdleTimeout 1000000"> -</ACE_Svc_Conf> diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl deleted file mode 100644 index 3bc8f9af25c..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test.idl +++ /dev/null @@ -1,12 +0,0 @@ -// -// $Id$ -// - -interface test -{ - long method (in long client_id, - in long iteration, - out long thread_count); - - oneway void shutdown (); -}; diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp deleted file mode 100644 index 6fbd244dd26..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.cpp +++ /dev/null @@ -1,71 +0,0 @@ -// $Id$ - -#include "test_i.h" -#include "ace/OS_NS_unistd.h" -#include "tao/ORB_Core.h" -#include "tao/RTCORBA/Thread_Pool.h" - -ACE_RCSID(Thread_Pools, test_i, "$Id$") - -test_i::test_i (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - long msec_sleep) - : orb_ (CORBA::ORB::_duplicate (orb)), - poa_ (PortableServer::POA::_duplicate (poa)), - nap_time_ () -{ - this->nap_time_.msec (msec_sleep); -} - -CORBA::Long -test_i::method (CORBA::Long client_id, - CORBA::Long iteration, - CORBA::Long_out thread_count - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - // Get the ORB_Core's TSS resources. - TAO_ORB_Core_TSS_Resources *tss = - this->orb_->orb_core ()->get_tss_resources (); - - /// Get the lane attribute in TSS. - TAO_Thread_Lane *lane = - static_cast <TAO_Thread_Lane *> (tss->lane_); - - if (lane) - ACE_DEBUG ((LM_DEBUG, - "Request in thread %t (pool id = %d; lane id = %d) for client %d iteration %d\n", - lane->pool ().id (), - lane->id (), - client_id, - iteration)); - else - ACE_DEBUG ((LM_DEBUG, - "Request in thread %t (default thread pool) for client %d iteration %d\n", - client_id, - iteration)); - - ACE_OS::sleep (this->nap_time_); - - if (lane) - thread_count = lane->current_threads (); - else - thread_count = 0; - - return iteration; -} - -PortableServer::POA_ptr -test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) -{ - return PortableServer::POA::_duplicate (this->poa_.in ()); -} - -void -test_i::shutdown (ACE_ENV_SINGLE_ARG_DECL) - ACE_THROW_SPEC ((CORBA::SystemException)) -{ - this->orb_->shutdown (0 - ACE_ENV_ARG_PARAMETER); - ACE_CHECK; -} diff --git a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h b/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h deleted file mode 100644 index 7951ca0854c..00000000000 --- a/TAO/tests/RTCORBA/Dynamic_Thread_Pool/test_i.h +++ /dev/null @@ -1,45 +0,0 @@ -//============================================================================= -/** - * @file test_i.h - * - * $Id$ - * - * @author Irfan Pyarali - */ -// =================================================================== - -#include "testS.h" - -class test_i : - public POA_test -{ -public: - /// Constructor. - test_i (CORBA::ORB_ptr orb, - PortableServer::POA_ptr poa, - long msec_sleep); - - /// Test method. - CORBA::Long method (CORBA::Long client_id, - CORBA::Long iteration, - CORBA::Long_out thread_count - ACE_ENV_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Shutdown the server. - void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) - ACE_THROW_SPEC ((CORBA::SystemException)); - - /// Our POA. - PortableServer::POA_ptr _default_POA (ACE_ENV_SINGLE_ARG_DECL); - -private: - /// ORB. - CORBA::ORB_var orb_; - - /// Our POA. - PortableServer::POA_var poa_; - - /// Time spent in executing the upcall. - ACE_Time_Value nap_time_; -}; diff --git a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc index a77351b5090..10ba9a8a48f 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc +++ b/TAO/tests/RTCORBA/Explicit_Binding/RTCORBA_Explicit_Binding.mpc @@ -8,7 +8,6 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp index 25e0135f39b..108318bbe63 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/client.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Strategies/advanced_resource.h" #include "tao/RTCORBA/RTCORBA.h" @@ -11,7 +12,7 @@ const char *ior = "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) @@ -46,19 +47,21 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, parse arguments, and resolve references. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl index 288bd3ddc2e..9317cc84307 100755 --- a/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl +++ b/TAO/tests/RTCORBA/Explicit_Binding/run_test.pl @@ -21,7 +21,7 @@ $CL = new PerlACE::Process ("client", "-o file://$iorfile -ORBdebuglevel 1"); $SV->Spawn (); -if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { +if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { print STDERR "ERROR: cannot find file <$iorfile>\n"; $SV->Kill (); exit 1; diff --git a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp index 7c434d0c2e5..0a02b151a7f 100644 --- a/TAO/tests/RTCORBA/Explicit_Binding/server.cpp +++ b/TAO/tests/RTCORBA/Explicit_Binding/server.cpp @@ -2,6 +2,7 @@ #include "testS.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/Strategies/advanced_resource.h" #include "tao/RTCORBA/RTCORBA.h" @@ -56,7 +57,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) @@ -119,7 +120,7 @@ create_object (PortableServer::POA_ptr poa, // Print ior to the file. if (filename != 0) { - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -133,17 +134,19 @@ create_object (PortableServer::POA_ptr poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RootPOA. diff --git a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc index 87178218057..0f82a323a72 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc +++ b/TAO/tests/RTCORBA/Linear_Priority/RTCORBA_Linear_Priority.mpc @@ -8,7 +8,6 @@ project(*Server): rt_server, minimum_corba { } project(*Client): rt_client, minimum_corba { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Linear_Priority/client.cpp b/TAO/tests/RTCORBA/Linear_Priority/client.cpp index 6588b34f7a4..b2fd947d35c 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/client.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/ORB_Core.h" @@ -20,7 +21,7 @@ static const char *bands_file = "empty_file"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "b:d:p:k:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:p:k:i:x"); int c; while ((c = get_opts ()) != -1) @@ -320,19 +321,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Linear_Priority/server.cpp b/TAO/tests/RTCORBA/Linear_Priority/server.cpp index 9129c0f3ee9..9b43e744902 100644 --- a/TAO/tests/RTCORBA/Linear_Priority/server.cpp +++ b/TAO/tests/RTCORBA/Linear_Priority/server.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "testS.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -79,7 +80,7 @@ static const char *lanes_file = "lanes"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "b:d:l:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:l:"); int c; while ((c = get_opts ()) != -1) @@ -119,7 +120,7 @@ write_iors_to_file (CORBA::Object_ptr object, ACE_ENV_ARG_DECL) { FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -285,19 +286,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc index a77351b5090..10ba9a8a48f 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/RTCORBA_MT_Client_Proto_Prio.mpc @@ -8,7 +8,6 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp index de8d374edf7..a57ced26bb6 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/client.cpp @@ -6,6 +6,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" #include "ace/Barrier.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "../check_supported_priorities.cpp" #include "tao/Strategies/advanced_resource.h" @@ -56,7 +57,7 @@ CORBA::ULong protocol2 = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:a:b:e:f:n:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:a:b:e:f:n:"); int c, result; while ((c = get_opts ()) != -1) @@ -291,19 +292,21 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, resolve references and parse arguments. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp index 893dbddf688..9886dd12c91 100644 --- a/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp +++ b/TAO/tests/RTCORBA/MT_Client_Protocol_Priority/server.cpp @@ -3,6 +3,7 @@ #include "testS.h" #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -56,7 +57,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) @@ -178,7 +179,7 @@ Task::svc (void) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -210,17 +211,19 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp index 9277febd56e..3bd37675c75 100644 --- a/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp +++ b/TAO/tests/RTCORBA/ORB_init/ORB_init.cpp @@ -4,6 +4,7 @@ #include "tao/ORB.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" int test_multiple_orbs (const char *test_name, @@ -77,16 +78,17 @@ test_multiple_orbs (const char *test_name, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + int iterations = 5; int rt_orb = 0; int destroy = 0; int result = test_multiple_orbs ("non-RT ORBs, disable destroy", - argc, - argv, + convert.get_argc(), convert.get_ASCII_argv(), iterations, rt_orb, destroy); @@ -97,8 +99,7 @@ main (int argc, char *argv[]) result = test_multiple_orbs ("non-RT ORBs, enable destroy", - argc, - argv, + convert.get_argc(), convert.get_ASCII_argv(), iterations, rt_orb, destroy); @@ -109,8 +110,7 @@ main (int argc, char *argv[]) result = test_multiple_orbs ("RT ORBs, disable destroy", - argc, - argv, + convert.get_argc(), convert.get_ASCII_argv(), iterations, rt_orb, destroy); @@ -121,8 +121,7 @@ main (int argc, char *argv[]) result = test_multiple_orbs ("RT ORBs, enable destroy", - argc, - argv, + convert.get_argc(), convert.get_ASCII_argv(), iterations, rt_orb, destroy); diff --git a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc index 87178218057..0f82a323a72 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc +++ b/TAO/tests/RTCORBA/Persistent_IOR/RTCORBA_Persistent_IOR.mpc @@ -8,7 +8,6 @@ project(*Server): rt_server, minimum_corba { } project(*Client): rt_client, minimum_corba { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp index 6e9b26cbec7..60696914f2b 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/client.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" static int iterations = 5; @@ -11,7 +12,7 @@ static const char *ior = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:x"); int c; while ((c = get_opts ()) != -1) @@ -50,19 +51,21 @@ parse_args (int argc, char **argv) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp index d75fb4a6afd..36b3636782e 100644 --- a/TAO/tests/RTCORBA/Persistent_IOR/server.cpp +++ b/TAO/tests/RTCORBA/Persistent_IOR/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testS.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "ace/OS_NS_stdio.h" @@ -76,7 +77,7 @@ static CORBA::ULong max_request_buffer_size = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "a:p:t:d:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "a:p:t:d:"); int c; while ((c = get_opts ()) != -1) @@ -122,7 +123,7 @@ write_iors_to_file (CORBA::Object_ptr object, ACE_ENV_ARG_DECL) { FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -341,19 +342,21 @@ create_poa_with_tp_and_persistent_policy (CORBA::ORB_ptr orb, } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Policies/Policies.cpp b/TAO/tests/RTCORBA/Policies/Policies.cpp index 63d97ab4717..8f7fb12eda8 100644 --- a/TAO/tests/RTCORBA/Policies/Policies.cpp +++ b/TAO/tests/RTCORBA/Policies/Policies.cpp @@ -23,18 +23,21 @@ #include "tao/AnyTypeCode/Any.h" #include "ace/Log_Msg.h" +#include "ace/Argv_Type_Converter.h" int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // Initialize the ORB first. CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; diff --git a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc index c7a5f0c3229..49d690018fd 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc +++ b/TAO/tests/RTCORBA/Policy_Combinations/RTCORBA_Policy_Combinations.mpc @@ -8,7 +8,6 @@ project(*Server): rt_server, minimum_corba { } project(*Client): rt_client { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp index 56f29a399f9..a09d06cec4d 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/client.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/client.cpp @@ -2,6 +2,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/RTCORBA.h" @@ -15,7 +16,7 @@ static RTCORBA::Priority default_thread_priority; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "k:i:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:i:x"); int c; while ((c = get_opts ()) != -1) @@ -140,19 +141,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl index 0c424ce42f1..1f0077fcdd8 100755 --- a/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl +++ b/TAO/tests/RTCORBA/Policy_Combinations/run_test.pl @@ -60,7 +60,7 @@ $SV->Spawn (); for $file (@iorfiles) { $file = PerlACE::LocalFile($file); - if (PerlACE::waitforfile_timed ($file, $PerlACE::wait_interval_for_process_creation) == -1) + if (PerlACE::waitforfile_timed ($file, 10) == -1) { $server = $SV->TimedWait (1); if ($server == 2) diff --git a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp index db378d994bd..38c44df730a 100644 --- a/TAO/tests/RTCORBA/Policy_Combinations/server.cpp +++ b/TAO/tests/RTCORBA/Policy_Combinations/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testS.h" #include "tao/ORB_Core.h" #include "ace/Task.h" @@ -115,7 +116,7 @@ static CORBA::Boolean allow_borrowing = 0; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "s:c:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "s:c:"); int c; while ((c = get_opts ()) != -1) @@ -150,7 +151,7 @@ write_iors_to_file (CORBA::Object_ptr object, ACE_ENV_ARG_DECL) { FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -906,19 +907,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc index ebf79370785..4cb4bcb6c23 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/Priority_Inversion_With_Bands.mpc @@ -9,7 +9,6 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp index d33a71f3f25..e4e15b61b13 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/client.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "testC.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/ORB_Core.h" @@ -17,7 +18,7 @@ static int make_banded_invocations = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "b:k:i:w:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:k:i:w:"); int c; while ((c = get_opts ()) != -1) @@ -193,16 +194,18 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl index 1afb4f6f967..158192e3461 100755 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/run_test.pl @@ -63,7 +63,7 @@ sub run_test for $test (@configurations) { - if (PerlACE::waitforfile_timed (PerlACE::LocalFile($test->{file}),$PerlACE::wait_interval_for_process_creation ) == -1) + if (PerlACE::waitforfile_timed (PerlACE::LocalFile($test->{file}), 10) == -1) { $server = $SV->TimedWait (1); if ($server == 2) diff --git a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp index e8259069e76..f20c8f967db 100644 --- a/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp +++ b/TAO/tests/RTCORBA/Priority_Inversion_With_Bands/server.cpp @@ -2,6 +2,7 @@ #include "test_i.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "ace/Task.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -19,7 +20,7 @@ static RTCORBA::Priority high_priority; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:d:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:d:t:"); int c; while ((c = get_opts ()) != -1) @@ -74,7 +75,7 @@ write_ior_to_file (CORBA::ORB_ptr orb, FILE *output_file = ACE_OS::fopen (filename, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -320,19 +321,20 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc index 87178218057..0f82a323a72 100644 --- a/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc +++ b/TAO/tests/RTCORBA/Private_Connection/RTCORBA_Private_Connection.mpc @@ -8,7 +8,6 @@ project(*Server): rt_server, minimum_corba { } project(*Client): rt_client, minimum_corba { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Private_Connection/client.cpp b/TAO/tests/RTCORBA/Private_Connection/client.cpp index a1b7369b55d..7d06914f2cb 100644 --- a/TAO/tests/RTCORBA/Private_Connection/client.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/client.cpp @@ -3,6 +3,7 @@ #include "testC.h" #include "tao/RTCORBA/RTCORBA.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" const char *ior1 = "file://test1.ior"; const char *ior2 = "file://test2.ior"; @@ -10,7 +11,7 @@ const char *ior2 = "file://test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:"); int c; while ((c = get_opts ()) != -1) @@ -49,19 +50,21 @@ check_for_nil (CORBA::Object_ptr obj, const char *msg) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, resolve references and parse arguments. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Private_Connection/server.cpp b/TAO/tests/RTCORBA/Private_Connection/server.cpp index 07a844b3abb..b6b1b2a6b3d 100644 --- a/TAO/tests/RTCORBA/Private_Connection/server.cpp +++ b/TAO/tests/RTCORBA/Private_Connection/server.cpp @@ -5,6 +5,7 @@ #include "tao/RTPortableServer/RTPortableServer.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" +#include "ace/Argv_Type_Converter.h" class Test_i : public POA_Test { @@ -56,7 +57,7 @@ const char *ior_output_file2 = "test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:"); int c; while ((c = get_opts ()) != -1) @@ -124,7 +125,7 @@ create_object (PortableServer::POA_ptr poa, // Print ior to the file. if (filename != 0) { - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -138,17 +139,19 @@ create_object (PortableServer::POA_ptr poa, } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RootPOA. diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc index 4d9a96b12f0..81a533380b3 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/PaE_Selection.mpc @@ -6,7 +6,6 @@ project(*Server): rt_server, strategies, portableserver, minimum_corba { } project(*Client): rt_client, strategies, portableserver, minimum_corba { - after += *Server Source_Files { client.cpp } diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp index 61acf71eab9..854d6424214 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/client.cpp @@ -16,6 +16,7 @@ #include "ace/Get_Opt.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/Strategies/advanced_resource.h" @@ -36,7 +37,7 @@ static const char *bands_file = "empty_file"; static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "b:d:i:k:p:t:x"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:i:k:p:t:x"); int c; while ((c = get_opts ()) != -1) @@ -559,21 +560,23 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int parse_args_result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (parse_args_result != 0) return parse_args_result; diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl index a58c5f6427c..bfc0b0ebaef 100755 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/run_test.pl @@ -98,7 +98,7 @@ sub run_server $SV = new PerlACE::Process ("server", "$server_args"); $SV->Spawn (); - if (PerlACE::waitforfile_timed ($iorfile,$PerlACE::wait_interval_for_process_creation ) == -1) + if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { check_supported_priorities ($SV); print STDERR "ERROR: cannot find ior file: $iorfile\n"; diff --git a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp index 234e6d3ef58..45f83161426 100644 --- a/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp +++ b/TAO/tests/RTCORBA/Profile_And_Endpoint_Selection/server.cpp @@ -1,6 +1,7 @@ // $Id$ #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/ORB_Core.h" #include "tao/RTCORBA/Thread_Pool.h" #include "tao/RTPortableServer/RTPortableServer.h" @@ -98,7 +99,7 @@ test_i::_default_POA (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) static int parse_args (int argc, char **argv) { - ACE_Get_Opt get_opts (argc, argv, "b:d:l:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "b:d:l:o:"); int c; while ((c = get_opts ()) != -1) @@ -151,7 +152,7 @@ write_iors_to_file (CORBA::Object_ptr object, ior_file_count++; FILE *file = - ACE_OS::fopen (filename, "w"); + ACE_OS::fopen (filename, ACE_TEXT("w")); ACE_ASSERT (file != 0); CORBA::String_var ior = @@ -390,19 +391,21 @@ Task::svc (void) } int -main (int argc, char **argv) +ACE_TMAIN (int argc, ACE_TCHAR **argv) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/RTMutex/server.cpp b/TAO/tests/RTCORBA/RTMutex/server.cpp index 425db1603fb..ea53f988992 100644 --- a/TAO/tests/RTCORBA/RTMutex/server.cpp +++ b/TAO/tests/RTCORBA/RTMutex/server.cpp @@ -6,6 +6,7 @@ #include "ace/High_Res_Timer.h" #include "ace/Get_Opt.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" static int test_try_lock_flag = #if defined (ACE_HAS_MUTEX_TIMEOUTS) && !defined (ACE_HAS_WTHREADS) @@ -23,7 +24,7 @@ static int test_try_lock_flag = static int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "t"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "t"); int c; while ((c = get_opts ()) != -1) @@ -498,16 +499,18 @@ test_mutex_try_lock (RTCORBA::RTORB_ptr rt_orb) #endif /* ACE_HAS_THREADS */ int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // ORB. - CORBA::ORB_var orb = CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_var orb = CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // RTORB. diff --git a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc index b62ff14a3d9..78e08a31786 100644 --- a/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc +++ b/TAO/tests/RTCORBA/Server_Declared/RTCORBA_Server_Declared.mpc @@ -8,7 +8,6 @@ project(*Server): rt_server { } project(*Client): rt_client { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Server_Declared/client.cpp b/TAO/tests/RTCORBA/Server_Declared/client.cpp index 9ac3ce834d6..e8d5090c754 100644 --- a/TAO/tests/RTCORBA/Server_Declared/client.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" const char *ior1 = "file://test1.ior"; @@ -10,7 +11,7 @@ const char *ior2 = "file://test2.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:o:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:o:"); int c; while ((c = get_opts ()) != -1) @@ -77,19 +78,21 @@ check_policy (Test_ptr server } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize the ORB, resolve references and parse arguments. // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Test object 1. diff --git a/TAO/tests/RTCORBA/Server_Declared/server.cpp b/TAO/tests/RTCORBA/Server_Declared/server.cpp index 6594427f846..adb805bb7df 100644 --- a/TAO/tests/RTCORBA/Server_Declared/server.cpp +++ b/TAO/tests/RTCORBA/Server_Declared/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "tao/ORB_Core.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" @@ -87,7 +88,7 @@ CORBA::Short object_priority = -1; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "p:o:a:b:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "p:o:a:b:"); int c, result; while ((c = get_opts ()) != -1) @@ -191,7 +192,7 @@ create_object (RTPortableServer::POA_ptr poa, // Print ior to the file. if (filename != 0) { - FILE *output_file= ACE_OS::fopen (filename, "w"); + FILE *output_file= ACE_OS::fopen (filename, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", @@ -325,17 +326,19 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // ORB. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Parse arguments. - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; // Make sure we can support multiple priorities that are required diff --git a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc index a77351b5090..10ba9a8a48f 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc +++ b/TAO/tests/RTCORBA/Server_Protocol/RTCORBA_Server_Protocol.mpc @@ -8,7 +8,6 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Server_Protocol/client.cpp b/TAO/tests/RTCORBA/Server_Protocol/client.cpp index 7dd24cdb9b5..71c63370691 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/client.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/client.cpp @@ -2,6 +2,7 @@ #include "testC.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTCORBA/RTCORBA.h" #include "tao/Strategies/advanced_resource.h" @@ -10,7 +11,7 @@ const char *ior = "file://test.ior"; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "k:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "k:"); int c; while ((c = get_opts ()) != -1) @@ -33,16 +34,18 @@ parse_args (int argc, char *argv[]) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { // Initialize and obtain reference to the Test object. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::Object_var object = diff --git a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl index 8921a85c6ec..6e1cafa833b 100755 --- a/TAO/tests/RTCORBA/Server_Protocol/run_test.pl +++ b/TAO/tests/RTCORBA/Server_Protocol/run_test.pl @@ -79,7 +79,7 @@ foreach $o (@server_opts) { $SV->Spawn (); - if (PerlACE::waitforfile_timed ($iorfile, $PerlACE::wait_interval_for_process_creation) == -1) { + if (PerlACE::waitforfile_timed ($iorfile, 10) == -1) { print STDERR "ERROR: cannot find IOR file <$iorfile>\n"; $SV->Kill (); $SV->TimedWait (1); exit 1; diff --git a/TAO/tests/RTCORBA/Server_Protocol/server.cpp b/TAO/tests/RTCORBA/Server_Protocol/server.cpp index 5ca5342d11e..459bb286b5a 100644 --- a/TAO/tests/RTCORBA/Server_Protocol/server.cpp +++ b/TAO/tests/RTCORBA/Server_Protocol/server.cpp @@ -7,6 +7,7 @@ #include "tao/ORB_Core.h" #include "tao/Policy_Set.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "tao/PortableServer/Root_POA.h" class Test_i : public POA_Test @@ -50,7 +51,7 @@ CORBA::ULong protocol_type = 0; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:p:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:p:"); int c, result; while ((c = get_opts ()) != -1) @@ -240,15 +241,17 @@ check_server_protocol_at_root_poa (CORBA::ORB_ptr /*orb*/, int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return -1; CORBA::Object_var object = @@ -340,7 +343,7 @@ main (int argc, char *argv[]) if (ior_output_file != 0) { - FILE *output_file= ACE_OS::fopen (ior_output_file, "w"); + FILE *output_file= ACE_OS::fopen (ior_output_file, ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, "Cannot open output file for writing IOR: %s", diff --git a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc index ebf79370785..4cb4bcb6c23 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc +++ b/TAO/tests/RTCORBA/Thread_Pool/RTCORBA_Thread_Pool.mpc @@ -9,7 +9,6 @@ project(*Server): strategies, rt_server, minimum_corba { } project(*Client): strategies, rt_client, minimum_corba { - after += *Server Source_Files { testC.cpp client.cpp diff --git a/TAO/tests/RTCORBA/Thread_Pool/client.cpp b/TAO/tests/RTCORBA/Thread_Pool/client.cpp index 727015a2353..5797909b3e5 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/client.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/client.cpp @@ -6,6 +6,7 @@ #include "tao/ORB_Core.h" #include "ace/Task.h" #include "ace/OS_NS_unistd.h" +#include "ace/Argv_Type_Converter.h" #include "../check_supported_priorities.cpp" ACE_RCSID(Thread_Pool, client, "$Id$") @@ -17,7 +18,7 @@ int shutdown_server = 0; 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) @@ -118,16 +119,18 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (convert.get_argc(), convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl index 2dcbc7246bf..df32e821eef 100755 --- a/TAO/tests/RTCORBA/Thread_Pool/run_test.pl +++ b/TAO/tests/RTCORBA/Thread_Pool/run_test.pl @@ -72,7 +72,7 @@ $SV->Spawn (); for $test (@configurations) { - if (PerlACE::waitforfile_timed ($test->{file}, $PerlACE::wait_interval_for_process_creation) == -1) + if (PerlACE::waitforfile_timed ($test->{file}, 10) == -1) { $server = $SV->TimedWait (1); if ($server == 2) diff --git a/TAO/tests/RTCORBA/Thread_Pool/server.cpp b/TAO/tests/RTCORBA/Thread_Pool/server.cpp index 5dd811de9bd..f652cb7c279 100644 --- a/TAO/tests/RTCORBA/Thread_Pool/server.cpp +++ b/TAO/tests/RTCORBA/Thread_Pool/server.cpp @@ -5,6 +5,7 @@ #include "ace/OS_NS_unistd.h" #include "tao/ORB_Core.h" #include "ace/Task.h" +#include "ace/Argv_Type_Converter.h" #include "tao/RTPortableServer/RTPortableServer.h" #include "../check_supported_priorities.cpp" @@ -19,7 +20,7 @@ long nap_time = 1000; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:s:d:t:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:s:d:t:"); int c; while ((c = get_opts ()) != -1) @@ -76,7 +77,7 @@ write_ior_to_file (CORBA::ORB_ptr orb, FILE *output_file = ACE_OS::fopen (filename, - "w"); + ACE_TEXT("w")); if (output_file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -329,19 +330,21 @@ Task::svc (void) } int -main (int argc, char *argv[]) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, - argv, + CORBA::ORB_init (convert.get_argc(), + convert.get_ASCII_argv(), "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; int result = - parse_args (argc, argv); + parse_args (convert.get_argc(), convert.get_ASCII_argv()); if (result != 0) return result; diff --git a/TAO/tests/RTCORBA/common_args.cpp b/TAO/tests/RTCORBA/common_args.cpp index 3085aa72bcb..73d51851c4e 100644 --- a/TAO/tests/RTCORBA/common_args.cpp +++ b/TAO/tests/RTCORBA/common_args.cpp @@ -20,7 +20,7 @@ get_priority_bands (const char *test_type, // Read bands from a file. // FILE* file = - ACE_OS::fopen (bands_file, "r"); + ACE_OS::fopen (bands_file, ACE_TEXT("r")); if (file == 0) ACE_ERROR_RETURN ((LM_ERROR, @@ -119,7 +119,7 @@ get_values (const char *test_type, // Read lanes from a file. // FILE* file = - ACE_OS::fopen (file_name, "r"); + ACE_OS::fopen (file_name, ACE_TEXT("r")); if (file == 0) ACE_ERROR_RETURN ((LM_ERROR, |