diff options
Diffstat (limited to 'TAO/orbsvcs/tests/EC_Throughput')
5 files changed, 26 insertions, 15 deletions
diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp index ade2d62e17a..9989afbbf97 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp index 609bf639245..50de18a26e4 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Consumer_Driver.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -21,10 +22,12 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECT_Consumer_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -95,7 +98,7 @@ ECT_Consumer_Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -295,9 +298,9 @@ ECT_Consumer_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) } int -ECT_Consumer_Driver::parse_args (int argc, char *argv []) +ECT_Consumer_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "xdc:s:h:p:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "xdc:s:h:p:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp index 0d75c42b29b..e4a90ac8900 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier.cpp @@ -10,6 +10,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp index d2350ca9a04..65e8abf658c 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Supplier_Driver.cpp @@ -11,6 +11,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/OS_NS_errno.h" @@ -21,10 +22,12 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + ECT_Supplier_Driver driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -107,7 +110,7 @@ ECT_Supplier_Driver::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -301,9 +304,9 @@ ECT_Supplier_Driver::dump_results (void) } int -ECT_Supplier_Driver::parse_args (int argc, char *argv []) +ECT_Supplier_Driver::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "ds:u:n:t:b:h:p:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "ds:u:n:t:b:h:p:"); int opt; while ((opt = get_opt ()) != EOF) diff --git a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp index 8aeb5fbbc40..f0552072ff8 100644 --- a/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp +++ b/TAO/orbsvcs/tests/EC_Throughput/ECT_Throughput.cpp @@ -15,6 +15,7 @@ #include "tao/debug.h" #include "ace/Get_Opt.h" +#include "ace/Argv_Type_Converter.h" #include "ace/Auto_Ptr.h" #include "ace/Sched_Params.h" #include "ace/High_Res_Timer.h" @@ -26,12 +27,14 @@ ACE_RCSID (EC_Throughput, "$Id$") int -main (int argc, char *argv []) +ACE_TMAIN (int argc, ACE_TCHAR *argv[]) { + ACE_Argv_Type_Converter convert (argc, argv); + TAO_EC_Default_Factory::init_svcs (); ECT_Throughput driver; - return driver.run (argc, argv); + return driver.run (convert.get_argc(), convert.get_ASCII_argv()); } // **************************************************************** @@ -136,7 +139,7 @@ ECT_Throughput::run (int argc, char* argv[]) if (this->pid_file_name_ != 0) { - FILE* pid = ACE_OS::fopen (this->pid_file_name_, "w"); + FILE* pid = ACE_OS::fopen (this->pid_file_name_, ACE_TEXT("w")); if (pid != 0) { ACE_OS::fprintf (pid, "%ld\n", @@ -475,9 +478,9 @@ ECT_Throughput::dump_results (void) } int -ECT_Throughput::parse_args (int argc, char *argv []) +ECT_Throughput::parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:"); + ACE_Get_Arg_Opt<char> get_opt (argc, argv, "dc:s:u:n:t:b:h:l:p:w:"); int opt; while ((opt = get_opt ()) != EOF) |