diff options
Diffstat (limited to 'TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp')
| -rw-r--r-- | TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp | 79 |
1 files changed, 25 insertions, 54 deletions
diff --git a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp index ee6b23f62df..c827562b411 100644 --- a/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp +++ b/TAO/orbsvcs/tests/AVStreams/Multicast/ftp.cpp @@ -49,25 +49,22 @@ FTP_Client_Callback::handle_timeout (void *) this->count_++; if (this->count_ == 2) { - ACE_TRY_NEW_ENV + try { ACE_DEBUG ((LM_DEBUG,"handle_timeout:End of file\n")); AVStreams::flowSpec stop_spec (1); //ACE_DECLARE_NEW_CORBA_ENV; - CLIENT::instance ()->streamctrl ()->stop (stop_spec ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; -// CLIENT::instance ()->streamctrl ()->destroy (stop_spec ACE_ENV_ARG_PARAMETER); -// ACE_TRY_CHECK; + CLIENT::instance ()->streamctrl ()->stop (stop_spec); +// CLIENT::instance ()->streamctrl ()->destroy (stop_spec); TAO_AV_CORE::instance ()->orb ()->shutdown (0); - ACE_TRY_CHECK; return 0; } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"FTP_Client_Callback::handle_timeout\n"); + ex._tao_print_exception ( + "FTP_Client_Callback::handle_timeout\n"); return -1; } - ACE_ENDTRY; } else return 0; @@ -186,36 +183,29 @@ Client::Client (void) int Client::bind_to_server (const char *name) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize the naming services CosNaming::Name server_mmdevice_name (1); server_mmdevice_name.length (1); server_mmdevice_name [0].id = name; CORBA::Object_var server_mmdevice_obj = - my_naming_client_->resolve (server_mmdevice_name - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + my_naming_client_->resolve (server_mmdevice_name); this->server_mmdevice_ = - AVStreams::MMDevice::_narrow (server_mmdevice_obj.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + AVStreams::MMDevice::_narrow (server_mmdevice_obj.in ()); if (CORBA::is_nil (this->server_mmdevice_.in ())) ACE_ERROR_RETURN ((LM_ERROR, " could not resolve Server_Mmdevice in Naming service <%s>\n"), -1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::bind_to_server\n"); + ex._tao_print_exception ("Client::bind_to_server\n"); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -257,8 +247,7 @@ Client::init (int argc,char **argv) int Client::run (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { char flow_protocol_str [BUFSIZ]; if (this->use_sfp_) @@ -268,7 +257,6 @@ Client::run (void) AVStreams::streamQoS_var the_qos (new AVStreams::streamQoS); AVStreams::flowSpec flow_spec (1); - ACE_TRY_CHECK; ACE_INET_Addr addr (this->address_); ACE_NEW_RETURN (this->flowname_, char [BUFSIZ], @@ -287,16 +275,13 @@ Client::run (void) ACE_DEBUG ((LM_DEBUG, "(%N,%l) Flowspec: %s\n", entry.entry_to_string() )); AVStreams::MMDevice_var client_mmdevice - = this->client_mmdevice_._this (ACE_ENV_SINGLE_ARG_PARAMETER); - ACE_TRY_CHECK; + = this->client_mmdevice_._this (); CORBA::Boolean result = this->streamctrl_.bind_devs (client_mmdevice.in (), AVStreams::MMDevice::_nil (), the_qos.inout (), - flow_spec - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + flow_spec); if (this->bind_to_server ("Server_MMDevice1") == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -304,9 +289,7 @@ Client::run (void) result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + flow_spec); if (this->bind_to_server ("Server_MMDevice2") == -1) ACE_ERROR_RETURN ((LM_ERROR, "(%P|%t) Error binding to the naming service\n"), @@ -314,35 +297,29 @@ Client::run (void) result = this->streamctrl_.bind_devs (AVStreams::MMDevice::_nil (), this->server_mmdevice_.in (), the_qos.inout (), - flow_spec - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + flow_spec); if (result == 0) ACE_ERROR_RETURN ((LM_ERROR,"streamctrl::bind_devs failed\n"),-1); AVStreams::flowSpec start_spec (1); start_spec.length (1); start_spec [0] = CORBA::string_dup (this->flowname_); - this->streamctrl_.start (start_spec ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + this->streamctrl_.start (start_spec); // Schedule a timer for the for the flow handler. //TAO_AV_CORE::instance ()->run (); ACE_Time_Value tv (10000,0); - TAO_AV_CORE::instance ()->orb ()->run (tv ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + TAO_AV_CORE::instance ()->orb ()->run (tv); ACE_DEBUG ((LM_DEBUG, "event loop finished\n")); ACE_DEBUG ((LM_DEBUG, "Exited the TAO_AV_Core::run\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client::run"); + ex._tao_print_exception ("Client::run"); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); return 0; } @@ -350,22 +327,18 @@ int main (int argc, char **argv) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = CORBA::ORB_init (argc, argv); CORBA::Object_var obj - = orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + = orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = PortableServer::POA::_narrow (obj.in ()); TAO_AV_CORE::instance ()->init (orb.in (), - poa.in () - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; + poa.in ()); int result = 0; result = CLIENT::instance ()->init (argc,argv); @@ -375,14 +348,12 @@ main (int argc, if (result < 0) ACE_ERROR_RETURN ((LM_ERROR,"client::run failed\n"),1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,"Client Failed\n"); + ex._tao_print_exception ("Client Failed\n"); return -1; } - ACE_ENDTRY; - ACE_CHECK_RETURN (-1); CLIENT::close (); // Explicitly finalize the Unmanaged_Singleton. |