diff options
Diffstat (limited to 'TAO/tests/Big_Request_Muxing/server.cpp')
-rw-r--r-- | TAO/tests/Big_Request_Muxing/server.cpp | 29 |
1 files changed, 13 insertions, 16 deletions
diff --git a/TAO/tests/Big_Request_Muxing/server.cpp b/TAO/tests/Big_Request_Muxing/server.cpp index 49e88b06fa6..33928847556 100644 --- a/TAO/tests/Big_Request_Muxing/server.cpp +++ b/TAO/tests/Big_Request_Muxing/server.cpp @@ -4,6 +4,7 @@ #include "ace/Get_Opt.h" #include "ace/OS_NS_stdio.h" #include "ace/OS_NS_sys_time.h" +#include "ace/Argv_Type_Converter.h" ACE_RCSID(Big_Request_Muxing, server, "$Id$") @@ -13,7 +14,7 @@ static int expected = 600; int parse_args (int argc, char *argv[]) { - ACE_Get_Opt get_opts (argc, argv, "o:e:"); + ACE_Get_Arg_Opt<char> get_opts (argc, argv, "o:e:"); int c; while ((c = get_opts ()) != -1) @@ -39,14 +40,16 @@ 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_DEBUG ((LM_DEBUG, "Starting server\n")); 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; CORBA::Object_var poa_object = @@ -66,7 +69,7 @@ main (int argc, char *argv[]) root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - if (parse_args (argc, argv) != 0) + if (parse_args (convert.get_argc(), convert.get_ASCII_argv()) != 0) return 1; Payload_Receiver *payload_receiver_impl; @@ -84,7 +87,7 @@ main (int argc, char *argv[]) ACE_TRY_CHECK; // If the ior_output_file exists, output the ior to it - 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", @@ -109,19 +112,13 @@ main (int argc, char *argv[]) break; } - int count = payload_receiver_impl->count(); - - if (count != expected) - { - ACE_DEBUG((LM_DEBUG, "Server waiting for extra messages, " - "have now %d messages already...\n", count)); + ACE_DEBUG((LM_DEBUG, "Server waiting for extra messages...\n")); - ACE_Time_Value tv(5); - orb->run(tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + ACE_Time_Value tv(3); + orb->run(tv ACE_ENV_ARG_PARAMETER); + ACE_TRY_CHECK; - count = payload_receiver_impl->count(); - } + int count = payload_receiver_impl->count(); int result = 0; |