diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event')
56 files changed, 615 insertions, 971 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index 83ead81a375..85e43d7675f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -22,17 +22,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -70,15 +69,13 @@ main (int argc, char* argv[]) event_source, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); supplier1.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1 - ACE_ENV_ARG_PARAMETER); + event_type + 1); // **************************************************************** @@ -100,24 +97,21 @@ main (int argc, char* argv[]) consumer_qos01.insert (event_source, event_type + 1, 0); consumer01.connect (consumer_admin.in (), - consumer_qos01.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos01.get_ConsumerQOS ()); Consumer consumer0 ("Consumer/0", event_type); // Create a consumer, intialize its RT_Info structures, and // connnect to the event channel.... consumer0.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos0.get_ConsumerQOS ()); Consumer consumer1 ("Consumer/1", event_type); // Create a consumer, intialize its RT_Info structures, and // connnect to the event channel.... consumer1.connect (consumer_admin.in (), - consumer_qos1.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos1.get_ConsumerQOS ()); // **************************************************************** @@ -135,22 +129,18 @@ main (int argc, char* argv[]) { ACE_Time_Value tv (0, 10000); consumer0.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos0.get_ConsumerQOS ()); consumer1.connect (consumer_admin.in (), - consumer_qos1.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos1.get_ConsumerQOS ()); if (i % 2 == 0) { consumer01.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos0.get_ConsumerQOS ()); } else { consumer01.connect (consumer_admin.in (), - consumer_qos01.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos01.get_ConsumerQOS ()); } ACE_OS::sleep (tv); @@ -181,7 +171,7 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // **************************************************************** @@ -199,12 +189,11 @@ main (int argc, char* argv[]) task1.push_count (), 1); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } @@ -269,8 +258,7 @@ Consumer::dump_results (int base_count, } void -Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL_NOT_USED) +Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h index 1cb23396ef5..15356ef9f95 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h @@ -40,8 +40,7 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); /// Number of events of type <event_base_type_> received. diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index 88da8d128cc..59c00b65055 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -81,7 +81,7 @@ EC_BCast::execute_test (void) // UDP socket. RtecEventChannelAdmin::ConsumerQOS sub; int shutdown_event_type; - this->build_consumer_qos (0, sub, shutdown_event_type ACE_ENV_ARG_PARAMETER); + this->build_consumer_qos (0, sub, shutdown_event_type); // Obtain UDP address in the string format for Gateway initialization. char address_server_arg [256]; @@ -108,8 +108,7 @@ EC_BCast::execute_test (void) return; gateway.run (this->orb_.in (), - this->event_channel_.in () - ACE_ENV_ARG_PARAMETER); + this->event_channel_.in ()); if (this->allocate_tasks () == -1) return; @@ -146,8 +145,7 @@ Simple_Address_Server (const ACE_INET_Addr& address) void Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&, - RtecUDPAdmin::UDP_Addr& address - ACE_ENV_ARG_DECL_NOT_USED) + RtecUDPAdmin::UDP_Addr& address) ACE_THROW_SPEC ((CORBA::SystemException)) { address = this->address_; diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.h b/TAO/orbsvcs/tests/Event/Basic/BCast.h index 0d07003579d..99048d0c9ab 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -73,8 +73,7 @@ public: Simple_Address_Server (const ACE_INET_Addr& address); virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr& address - ACE_ENV_ARG_DECL) + RtecUDPAdmin::UDP_Addr& address) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp index 3397f5ee01b..c95577609b9 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -17,17 +17,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -63,26 +62,22 @@ main (int argc, char* argv[]) EC_Counting_Supplier first_supplier; first_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); first_supplier.connect (supplier_admin.in (), 0x00001111UL, 0x11110000UL, 0x00001111UL, - 0x11110000UL - ACE_ENV_ARG_PARAMETER); + 0x11110000UL); EC_Counting_Supplier second_supplier; second_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); second_supplier.connect (supplier_admin.in (), 0x01100000UL, 0x00000110UL, 0x01100000UL, - 0x00000110UL - ACE_ENV_ARG_PARAMETER); + 0x00000110UL); // **************************************************************** @@ -97,8 +92,7 @@ main (int argc, char* argv[]) consumer_qos.insert (0x01100000, 0x00000110, 0); consumer_bitmask_reject.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -113,8 +107,7 @@ main (int argc, char* argv[]) consumer_qos.insert_null_terminator (); consumer_bitmask_accept.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -129,8 +122,7 @@ main (int argc, char* argv[]) consumer_qos.insert_null_terminator (); consumer_bitmask_filter.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -146,8 +138,7 @@ main (int argc, char* argv[]) 0x01100000, 0x00000110); consumer_bitmask_value.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -163,8 +154,7 @@ main (int argc, char* argv[]) 0x01100000, 0x00000110); consumer_bitmask_loose.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -195,7 +185,7 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // **************************************************************** @@ -214,11 +204,10 @@ main (int argc, char* argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index fef941cd784..52950b5c3aa 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -16,17 +16,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -62,56 +61,48 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier_00; supplier_00.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier_00.connect (supplier_admin.in (), event_source, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); // **************************************************************** EC_Counting_Supplier supplier_01; supplier_01.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier_01.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1 - ACE_ENV_ARG_PARAMETER); + event_type + 1); // **************************************************************** EC_Counting_Supplier supplier_10; supplier_10.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier_10.connect (supplier_admin.in (), event_source + 1, event_type, event_source + 1, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); // **************************************************************** EC_Counting_Supplier supplier_11; supplier_11.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier_11.connect (supplier_admin.in (), event_source + 1, event_type + 1, event_source + 1, - event_type + 1 - ACE_ENV_ARG_PARAMETER); + event_type + 1); // **************************************************************** @@ -128,8 +119,7 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type, 0); consumer_00.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -147,8 +137,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); consumer_01.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -180,7 +169,7 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); @@ -196,11 +185,10 @@ main (int argc, char* argv[]) + supplier_11.event_count; consumer_01.dump_results (expected, 5); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index cc364beb3b9..04ba3be9f2d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -22,17 +22,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -69,8 +68,7 @@ main (int argc, char* argv[]) event_source, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); // **************************************************************** @@ -83,16 +81,14 @@ main (int argc, char* argv[]) consumer_qos0.insert (event_source, event_type, 0); consumer0.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos0.get_ConsumerQOS ()); // Create a consumer, intialize its RT_Info structures, and // connnect to the event channel.... Consumer consumer1 ("Consumer/1", 200); consumer1.connect (consumer_admin.in (), - consumer_qos0.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos0.get_ConsumerQOS ()); // **************************************************************** @@ -128,7 +124,7 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // **************************************************************** @@ -144,12 +140,11 @@ main (int argc, char* argv[]) consumer0.dump_results (100, 5); consumer1.dump_results (200, 5); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } @@ -163,8 +158,7 @@ Consumer::Consumer (const char* name, } void -Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) +Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h index f8e27523603..dbf5944fcab 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.h +++ b/TAO/orbsvcs/tests/Event/Basic/Control.h @@ -34,8 +34,7 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp index a834b3d9955..389845e2d77 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -13,68 +13,63 @@ ACE_RCSID (EC_Tests, "$Id$") static void run_test (PortableServer::POA_ptr poa, - int use_callbacks - ACE_ENV_ARG_DECL); + int use_callbacks); int main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); // **************************************************************** - run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER); + run_test (poa.in (), 0); - run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER); + run_test (poa.in (), 1); // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } // **************************************************************** void -deactivate_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +deactivate_servant (PortableServer::Servant servant) { PortableServer::POA_var poa = servant->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (servant); + poa->deactivate_object (id.in ()); } void run_test (PortableServer::POA_ptr poa, - int use_callbacks - ACE_ENV_ARG_DECL) + int use_callbacks) { TAO_EC_Event_Channel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = use_callbacks; @@ -119,19 +114,15 @@ run_test (PortableServer::POA_ptr poa, for (int i = 0; i != iterations; ++i) { supplier_0.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + supplier_qos.get_SupplierQOS ()); consumer_0.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); if (i % 2 == 1) { supplier_1.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + supplier_qos.get_SupplierQOS ()); consumer_1.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } supplier_0.disconnect (); consumer_0.disconnect (); @@ -143,19 +134,17 @@ run_test (PortableServer::POA_ptr poa, } supplier_0.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + supplier_qos.get_SupplierQOS ()); consumer_0.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); event_channel->destroy (); - deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER); + deactivate_servant (&supplier_0); - deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER); + deactivate_servant (&consumer_0); - deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER); + deactivate_servant (&ec_impl); CORBA::ULong count_0 = 1; CORBA::ULong count_1 = 0; diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index f98ea924d49..ffe5ab0ee09 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -17,17 +17,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -77,14 +76,13 @@ main (int argc, char* argv[]) TAO_EC_Gateway_IIOP gateway; gateway.init (event_channel_1.in (), - event_channel_2.in () - ACE_ENV_ARG_PARAMETER); + event_channel_2.in ()); RtecEventChannelAdmin::Observer_var obs = gateway._this (); RtecEventChannelAdmin::Observer_Handle h = - event_channel_2->append_observer (obs.in () ACE_ENV_ARG_PARAMETER); + event_channel_2->append_observer (obs.in ()); gateway.observer_handle (h); @@ -97,26 +95,22 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier_00; supplier_00.activate (consumer_admin_1.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier_00.connect (supplier_admin_1.in (), event_source, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); EC_Counting_Supplier supplier_01; supplier_01.activate (consumer_admin_1.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier_01.connect (supplier_admin_1.in (), event_source, event_type + 1, event_source, - event_type + 1 - ACE_ENV_ARG_PARAMETER); + event_type + 1); // **************************************************************** @@ -131,8 +125,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -161,8 +154,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type + 1, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -187,8 +179,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -216,8 +207,7 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -246,8 +236,7 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type + 1, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -272,8 +261,7 @@ main (int argc, char* argv[]) consumer_qos.insert_type (event_type, 0); consumer_00.connect (consumer_admin_2.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -309,15 +297,14 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 596b32de23e..517abfd04ff 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -14,68 +14,63 @@ ACE_RCSID (EC_Tests, "$Id$") static void run_test (PortableServer::POA_ptr poa, - int use_callbacks - ACE_ENV_ARG_DECL); + int use_callbacks); int main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); // **************************************************************** - run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER); + run_test (poa.in (), 0); - run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER); + run_test (poa.in (), 1); // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } // **************************************************************** void -deactivate_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +deactivate_servant (PortableServer::Servant servant) { PortableServer::POA_var poa = servant->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (servant); + poa->deactivate_object (id.in ()); } void run_test (PortableServer::POA_ptr poa, - int use_callbacks - ACE_ENV_ARG_DECL) + int use_callbacks) { TAO_EC_Event_Channel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = use_callbacks; @@ -98,7 +93,7 @@ run_test (PortableServer::POA_ptr poa, event_channel->destroy (); - deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER); + deactivate_servant (&ec_impl); } Task::Task (RtecEventChannelAdmin::EventChannel_ptr ec, @@ -114,15 +109,14 @@ Task::svc () { for (int i = 0; i < 10; ++i) { - ACE_TRY_NEW_ENV + try { this->run_iteration (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; } return 0; } @@ -162,19 +156,15 @@ Task::run_iteration (void) for (int i = 0; i != iterations; ++i) { supplier_0.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + supplier_qos.get_SupplierQOS ()); consumer_0.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); if (i % 2 == 1) { supplier_1.connect (supplier_admin.in (), - supplier_qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + supplier_qos.get_SupplierQOS ()); consumer_1.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } supplier_0.disconnect (); consumer_0.disconnect (); @@ -185,9 +175,9 @@ Task::run_iteration (void) } } - deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER); + deactivate_servant (&supplier_0); - deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER); + deactivate_servant (&consumer_0); CORBA::ULong count_0 = 0; CORBA::ULong count_1 = 0; diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index 3383cb24d2f..5e2a7583dd0 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -17,17 +17,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -65,38 +64,32 @@ main (int argc, char* argv[]) EC_Counting_Supplier first_supplier; first_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); first_supplier.connect (supplier_admin.in (), event_source, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); EC_Counting_Supplier second_supplier; second_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); second_supplier.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1 - ACE_ENV_ARG_PARAMETER); + event_type + 1); EC_Counting_Supplier third_supplier; third_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); third_supplier.connect (supplier_admin.in (), event_source, event_type + 1, event_source, - event_type + 1 - ACE_ENV_ARG_PARAMETER); + event_type + 1); // **************************************************************** @@ -111,8 +104,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); regular_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -128,8 +120,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); negation_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -162,7 +153,7 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // **************************************************************** @@ -176,11 +167,10 @@ main (int argc, char* argv[]) orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index 1760f2ba518..42e6d25d91c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -42,7 +42,7 @@ EC_Master::~EC_Master (void) int EC_Master::run (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { // Calibrate the high resolution timer *before* starting the // test. @@ -50,7 +50,7 @@ EC_Master::run (int argc, char* argv[]) this->seed_ = ACE_OS::time (0); - this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER); + this->initialize_orb_and_poa (argc, argv); if (this->parse_args (argc, argv)) return 1; @@ -85,7 +85,7 @@ EC_Master::run (int argc, char* argv[]) int targc = argc; for (int j = 0; j < targc; ++j) targv[j] = argv[j]; - this->channels_[i]->run_init (targc, targv ACE_ENV_ARG_PARAMETER); + this->channels_[i]->run_init (targc, targv); } delete[] targv; } @@ -133,32 +133,29 @@ EC_Master::run (int argc, char* argv[]) } this->root_poa_->destroy (1, - 1 - ACE_ENV_ARG_PARAMETER); + 1); this->orb_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run"); + ex._tao_print_exception ("EC_Driver::run"); } - ACE_CATCHALL + catch (...) { ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n")); } - ACE_ENDTRY; return 0; } void -EC_Master::initialize_orb_and_poa (int &argc, char* argv[] - ACE_ENV_ARG_DECL) +EC_Master::initialize_orb_and_poa (int &argc, char* argv[]) { this->orb_ = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -168,7 +165,7 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[] } this->root_poa_ = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); @@ -236,8 +233,7 @@ EC_Observer::~EC_Observer (void) } void -EC_Observer::initialize_orb_and_poa (int&, char*[] - ACE_ENV_ARG_DECL_NOT_USED) +EC_Observer::initialize_orb_and_poa (int&, char*[]) { } @@ -274,14 +270,13 @@ EC_Observer::execute_test (void) this->master_->channel (i)->event_channel_.in (); this->gwys_[i].init (rmt_ec, - this->event_channel_.in () - ACE_ENV_ARG_PARAMETER); + this->event_channel_.in ()); RtecEventChannelAdmin::Observer_var obs = this->gwys_[i]._this (); RtecEventChannelAdmin::Observer_Handle h = - rmt_ec->append_observer (obs.in () ACE_ENV_ARG_PARAMETER); + rmt_ec->append_observer (obs.in ()); this->gwys_[i].observer_handle (h); @@ -307,8 +302,7 @@ EC_Observer::run_cleanup (void) RtecEventChannelAdmin::EventChannel_ptr rmt_ec = this->master_->channel (j)->event_channel_.in (); - rmt_ec->remove_observer (this->gwys_[j].observer_handle () - ACE_ENV_ARG_PARAMETER); + rmt_ec->remove_observer (this->gwys_[j].observer_handle ()); this->gwys_[j].shutdown (); } @@ -343,25 +337,21 @@ EC_Observer::dump_results (void) void EC_Observer::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i - ACE_ENV_ARG_DECL) + int i) { if (i == 0) { - this->EC_Driver::connect_consumer (consumer_admin, i - ACE_ENV_ARG_PARAMETER); + this->EC_Driver::connect_consumer (consumer_admin, i); return; } unsigned int x = ACE_OS::rand_r (this->seed_); if (x < RAND_MAX / 8) - this->EC_Driver::connect_consumer (consumer_admin, i - ACE_ENV_ARG_PARAMETER); + this->EC_Driver::connect_consumer (consumer_admin, i); } void EC_Observer::consumer_push (void*, - const RtecEventComm::EventSet& - ACE_ENV_ARG_DECL) + const RtecEventComm::EventSet&) { unsigned int x = ACE_OS::rand_r (this->seed_); if (x < (RAND_MAX / 64)) @@ -384,7 +374,7 @@ EC_Observer::consumer_push (void*, else { this->EC_Driver::connect_consumer (consumer_admin.in (), - i ACE_ENV_ARG_PARAMETER); + i); } } } diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index f4a3150655a..d307ba61e04 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -41,8 +41,7 @@ public: virtual int run (int argc, char* argv[]); /// Obtain the orb and the poa pointers - virtual void initialize_orb_and_poa (int& argc, char* argv[] - ACE_ENV_ARG_DECL); + virtual void initialize_orb_and_poa (int& argc, char* argv[]); /// Accessors int channel_count (void) const; @@ -87,8 +86,7 @@ public: // = The EC_Driver methods /// add some command line args to enable/disable observerions - virtual void initialize_orb_and_poa (int& argc, char* argv[] - ACE_ENV_ARG_DECL); + virtual void initialize_orb_and_poa (int& argc, char* argv[]); virtual int parse_args (int& argc, char* argv[]); virtual void print_args (void) const; virtual void print_usage (void); @@ -100,11 +98,9 @@ public: void dump_results (void); void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i - ACE_ENV_ARG_DECL); + int i); void consumer_push (void*, - const RtecEventComm::EventSet& - ACE_ENV_ARG_DECL); + const RtecEventComm::EventSet&); private: EC_Master *master_; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 8e6f8be808d..a81426f0c6a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -25,14 +25,13 @@ main (int argc, char* argv[]) const int base_type = 20; void -deactivate_servant (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +deactivate_servant (PortableServer::Servant servant) { PortableServer::POA_var poa = servant->_default_POA (); PortableServer::ObjectId_var oid = - poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (servant); + poa->deactivate_object (oid.in ()); } @@ -50,11 +49,10 @@ RND_Driver::RND_Driver (void) int RND_Driver::run (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // **************************************************************** @@ -116,9 +114,9 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -164,8 +162,7 @@ RND_Driver::run (int argc, char *argv[]) 0); this->timer_.connect (this->consumer_admin_.in (), - qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_ConsumerQOS ()); } // **************************************************************** @@ -175,8 +172,7 @@ RND_Driver::run (int argc, char *argv[]) qos.insert (0, base_type, 0, 1); this->supplier_.connect (this->supplier_admin_.in (), - qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_SupplierQOS ()); } // **************************************************************** @@ -222,8 +218,7 @@ RND_Driver::run (int argc, char *argv[]) { for (int k = 0; k != this->nsuppliers_; ++k) { - deactivate_servant (this->suppliers_[k] - ACE_ENV_ARG_PARAMETER); + deactivate_servant (this->suppliers_[k]); this->suppliers_[k]->_remove_ref (); } delete[] this->suppliers_; @@ -241,8 +236,7 @@ RND_Driver::run (int argc, char *argv[]) { for (int k = 0; k != this->nconsumers_; ++k) { - deactivate_servant (this->consumers_[k] - ACE_ENV_ARG_PARAMETER); + deactivate_servant (this->consumers_[k]); this->consumers_[k]->_remove_ref (); } delete[] this->consumers_; @@ -251,29 +245,26 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** - deactivate_servant (&ec_impl - ACE_ENV_ARG_PARAMETER); + deactivate_servant (&ec_impl); // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // **************************************************************** orb->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Random"); + ex._tao_print_exception ("Random"); return 1; } - ACE_ENDTRY; return 0; } void -RND_Driver::timer (const RtecEventComm::Event &e - ACE_ENV_ARG_DECL) +RND_Driver::timer (const RtecEventComm::Event &e) { int r = ACE_OS::rand (); if (r < 0) @@ -293,7 +284,7 @@ RND_Driver::timer (const RtecEventComm::Event &e event.length (1); event[0] = e; event[0].header.source ++; - this->supplier_.push (event ACE_ENV_ARG_PARAMETER); + this->supplier_.push (event); } } break; @@ -316,8 +307,7 @@ RND_Driver::timer (const RtecEventComm::Event &e qos.insert (0, base_type, 0, 1); this->suppliers_[n]->connect (this->supplier_admin_.in (), - qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_SupplierQOS ()); } break; @@ -332,8 +322,7 @@ RND_Driver::timer (const RtecEventComm::Event &e qos.insert_type (base_type, 0); this->consumers_[n]->connect (this->consumer_admin_.in (), - qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_ConsumerQOS ()); } break; @@ -360,35 +349,31 @@ RND_Driver::timer (const RtecEventComm::Event &e } void -RND_Driver::event (const RtecEventComm::Event &e - ACE_ENV_ARG_DECL) +RND_Driver::event (const RtecEventComm::Event &e) { - this->timer (e ACE_ENV_ARG_PARAMETER); + this->timer (e); } // **************************************************************** void -RND_Timer::push (const RtecEventComm::EventSet &event - ACE_ENV_ARG_DECL) +RND_Timer::push (const RtecEventComm::EventSet &event) ACE_THROW_SPEC ((CORBA::SystemException)) { - ACE_TRY + try { - this->driver_->timer (event[0] ACE_ENV_ARG_PARAMETER); + this->driver_->timer (event[0]); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; } // **************************************************************** void RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, - const RtecEventChannelAdmin::ConsumerQOS &qos - ACE_ENV_ARG_DECL) + const RtecEventChannelAdmin::ConsumerQOS &qos) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -404,8 +389,7 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, RtecEventComm::PushConsumer_var me = this->_this (); proxy->connect_push_consumer (me.in (), - qos - ACE_ENV_ARG_PARAMETER); + qos); } void @@ -421,11 +405,10 @@ RND_Consumer::disconnect (void) } void -RND_Consumer::push (const RtecEventComm::EventSet &event - ACE_ENV_ARG_DECL) +RND_Consumer::push (const RtecEventComm::EventSet &event) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->event (event[0] ACE_ENV_ARG_PARAMETER); + this->driver_->event (event[0]); } void @@ -438,8 +421,7 @@ RND_Consumer::disconnect_push_consumer (void) void RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, - const RtecEventChannelAdmin::SupplierQOS &qos - ACE_ENV_ARG_DECL) + const RtecEventChannelAdmin::SupplierQOS &qos) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -456,8 +438,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, RtecEventComm::PushSupplier_var me = this->_this (); proxy->connect_push_supplier (me.in (), - qos - ACE_ENV_ARG_PARAMETER); + qos); } void @@ -480,12 +461,11 @@ RND_Supplier::push_new_event (void) event[0].header.type = base_type; event[0].header.source = 0; - this->push (event ACE_ENV_ARG_PARAMETER); + this->push (event); } void -RND_Supplier::push (RtecEventComm::EventSet &event - ACE_ENV_ARG_DECL) +RND_Supplier::push (RtecEventComm::EventSet &event) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -498,7 +478,7 @@ RND_Supplier::push (RtecEventComm::EventSet &event RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ()); } - proxy->push (event ACE_ENV_ARG_PARAMETER); + proxy->push (event); } void @@ -515,18 +495,16 @@ RND_Supplier::svc (void) int niterations = 5000; for (int i = 0; i != niterations; ++i) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { ACE_Time_Value tv (0, 10000); ACE_OS::sleep (tv); this->push_new_event (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; if (this->verbose_ && i * 100 / niterations >= percent) { diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 858179740a3..b18d4a3e44d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -35,15 +35,13 @@ public: /// Constructor RND_Consumer (RND_Driver *driver); - void push (const RtecEventComm::EventSet &event - ACE_ENV_ARG_DECL) + void push (const RtecEventComm::EventSet &event) ACE_THROW_SPEC ((CORBA::SystemException)); void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, - const RtecEventChannelAdmin::ConsumerQOS &qos - ACE_ENV_ARG_DECL); + const RtecEventChannelAdmin::ConsumerQOS &qos); void disconnect (void); protected: @@ -70,8 +68,7 @@ class RND_Timer : public RND_Consumer public: RND_Timer (RND_Driver *driver); - void push (const RtecEventComm::EventSet &event - ACE_ENV_ARG_DECL) + void push (const RtecEventComm::EventSet &event) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -97,14 +94,12 @@ public: RND_Supplier (int verbose); void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, - const RtecEventChannelAdmin::SupplierQOS &qos - ACE_ENV_ARG_DECL); + const RtecEventChannelAdmin::SupplierQOS &qos); void disconnect (void); /// Push a single event... void push_new_event (void); - void push (RtecEventComm::EventSet &event - ACE_ENV_ARG_DECL); + void push (RtecEventComm::EventSet &event); virtual void disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)); @@ -140,12 +135,10 @@ public: int run (int argc, char *argv[]); /// The main timer has expired - void timer (const RtecEventComm::Event &e - ACE_ENV_ARG_DECL); + void timer (const RtecEventComm::Event &e); /// One of the consumers has received an event - void event (const RtecEventComm::Event &e - ACE_ENV_ARG_DECL); + void event (const RtecEventComm::Event &e); private: RND_Driver (const RND_Driver &); diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 8fad75483d0..ebeab3df0bb 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -112,7 +112,7 @@ EC_Reconnect::execute_consumer_test (void) { RtecEventChannelAdmin::ConsumerQOS qos; int shutdown_event_type; - this->build_consumer_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); + this->build_consumer_qos (0, qos, shutdown_event_type); if (this->allow_consumer_reconnect_) { @@ -121,8 +121,7 @@ EC_Reconnect::execute_consumer_test (void) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->consumers_[0]->connect (qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); ACE_hrtime_t stop = ACE_OS::gethrtime (); this->consumer_reconnect_.sample (stop - start_time, stop - start); @@ -130,24 +129,21 @@ EC_Reconnect::execute_consumer_test (void) } else { - ACE_TRY + try { this->consumers_[0]->connect (qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); ACE_DEBUG ((LM_ERROR, "Expected exception\n")); } - ACE_CATCH (RtecEventChannelAdmin::AlreadyConnected, ex) + catch (const RtecEventChannelAdmin::AlreadyConnected& ex) { /* do nothing */ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Expected AlreadyConnected exception"); + ex._tao_print_exception ("Expected AlreadyConnected exception"); } - ACE_ENDTRY; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = this->event_channel_->for_consumers (); @@ -159,8 +155,7 @@ EC_Reconnect::execute_consumer_test (void) this->consumers_[0]->disconnect (); this->consumers_[0]->connect (consumer_admin.in (), qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); ACE_hrtime_t stop = ACE_OS::gethrtime (); this->consumer_reconnect_.sample (stop - start_time, stop - start); @@ -173,7 +168,7 @@ EC_Reconnect::execute_supplier_test (void) { RtecEventChannelAdmin::SupplierQOS qos; int shutdown_event_type; - this->build_supplier_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); + this->build_supplier_qos (0, qos, shutdown_event_type); if (this->allow_supplier_reconnect_) { @@ -181,8 +176,7 @@ EC_Reconnect::execute_supplier_test (void) for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[0]->connect (qos, shutdown_event_type - ACE_ENV_ARG_PARAMETER); + this->suppliers_[0]->connect (qos, shutdown_event_type); ACE_hrtime_t stop = ACE_OS::gethrtime (); this->supplier_reconnect_.sample (stop - start_time, stop - start); @@ -190,23 +184,20 @@ EC_Reconnect::execute_supplier_test (void) } else { - ACE_TRY + try { - this->suppliers_[0]->connect (qos, shutdown_event_type - ACE_ENV_ARG_PARAMETER); + this->suppliers_[0]->connect (qos, shutdown_event_type); ACE_DEBUG ((LM_ERROR, "Expected exception\n")); } - ACE_CATCH (RtecEventChannelAdmin::AlreadyConnected, ex) + catch (const RtecEventChannelAdmin::AlreadyConnected& ex) { /* do nothing */ } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Expected AlreadyConnected exception"); + ex._tao_print_exception ("Expected AlreadyConnected exception"); } - ACE_ENDTRY; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = this->event_channel_->for_suppliers (); @@ -218,8 +209,7 @@ EC_Reconnect::execute_supplier_test (void) this->suppliers_[0]->disconnect (); this->suppliers_[0]->connect (supplier_admin.in (), qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); ACE_hrtime_t stop = ACE_OS::gethrtime (); this->supplier_reconnect_.sample (stop - start_time, stop - start); diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index 21823adbeb0..399a00fe4e7 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -91,8 +91,7 @@ EC_Schedule::execute_test (void) infos.out (), deps.out (), configs.out (), - anomalies.out () - ACE_ENV_ARG_PARAMETER); + anomalies.out ()); if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, @@ -113,14 +112,13 @@ void EC_Schedule::build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, - int& shutdown_event_type - ACE_ENV_ARG_DECL) + int& shutdown_event_type) { char name[128]; ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04x", i); RtecScheduler::handle_t rt_info = - this->scheduler_->create (name ACE_ENV_ARG_PARAMETER); + this->scheduler_->create (name); // The worst case execution time is far less than 2 // milliseconds, but that is a safe estimate.... @@ -134,8 +132,7 @@ EC_Schedule::build_consumer_qos ( RtecScheduler::VERY_LOW_IMPORTANCE, time, 0, - RtecScheduler::OPERATION - ACE_ENV_ARG_PARAMETER); + RtecScheduler::OPERATION); int type_start = this->consumer_type_start_ @@ -157,14 +154,13 @@ void EC_Schedule::build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, - int& shutdown_event_type - ACE_ENV_ARG_DECL) + int& shutdown_event_type) { char name[128]; ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04x", i); RtecScheduler::handle_t rt_info = - this->scheduler_->create (name ACE_ENV_ARG_PARAMETER); + this->scheduler_->create (name); ACE_Time_Value tv (0, this->burst_pause_); RtecScheduler::Period_t rate = tv.usec () * 10; @@ -183,8 +179,7 @@ EC_Schedule::build_supplier_qos ( RtecScheduler::VERY_LOW_IMPORTANCE, time, 1, - RtecScheduler::OPERATION - ACE_ENV_ARG_PARAMETER); + RtecScheduler::OPERATION); int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_; int supplier_id = i + 1; diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index 7a96f7dd68f..c627edeb04d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -66,13 +66,11 @@ public: virtual void build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, - int& shutdown_event_type - ACE_ENV_ARG_DECL_NOT_USED); + int& shutdown_event_type); virtual void build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, - int& shutdown_event_type - ACE_ENV_ARG_DECL_NOT_USED); + int& shutdown_event_type); private: /// The scheduler implementation diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index 42a021e0822..69353f28f52 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -66,8 +66,7 @@ EC_Shutdown::dump_results (void) } void -EC_Shutdown::consumer_disconnect (void* cookie - ACE_ENV_ARG_DECL_NOT_USED) +EC_Shutdown::consumer_disconnect (void* cookie) { this->consumer_disconnects_++; if (this->verbose ()) @@ -75,8 +74,7 @@ EC_Shutdown::consumer_disconnect (void* cookie } void -EC_Shutdown::supplier_disconnect (void* cookie - ACE_ENV_ARG_DECL_NOT_USED) +EC_Shutdown::supplier_disconnect (void* cookie) { this->supplier_disconnects_++; if (this->verbose ()) diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h index bab331f1a07..b24d59eed49 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h @@ -42,12 +42,10 @@ public: void dump_results (void); /// One of the consumers in the test has been disconnected from the EC - virtual void consumer_disconnect (void* consumer_cookie - ACE_ENV_ARG_DECL); + virtual void consumer_disconnect (void* consumer_cookie); /// One of the suppliers in the test has been disconnected from the EC - virtual void supplier_disconnect (void* supplier_cookie - ACE_ENV_ARG_DECL); + virtual void supplier_disconnect (void* supplier_cookie); private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 876866bfeb1..267c97c53e2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -19,17 +19,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -61,11 +60,10 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier; supplier.activate (consumer_admin.in (), - 50 ACE_ENV_ARG_PARAMETER); + 50); supplier.connect (supplier_admin.in (), 0, 20, - 0, 20 - ACE_ENV_ARG_PARAMETER); + 0, 20); // **************************************************************** @@ -90,8 +88,7 @@ main (int argc, char* argv[]) 0); interval_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -116,8 +113,7 @@ main (int argc, char* argv[]) 0); conjunction_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -138,8 +134,7 @@ main (int argc, char* argv[]) 0); deadline_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -166,7 +161,7 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // **************************************************************** @@ -174,11 +169,10 @@ main (int argc, char* argv[]) conjunction_consumer.dump_results (25, 5); deadline_consumer.dump_results (100, 5); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 7f8b2f0e7f3..8025a446b2b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -16,17 +16,16 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -62,70 +61,60 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier; supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); supplier.connect (supplier_admin.in (), event_source, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); // **************************************************************** EC_Counting_Supplier other_supplier; other_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); other_supplier.connect (supplier_admin.in (), event_source + 1, event_type + 1, event_source + 1, - event_type + 1 - ACE_ENV_ARG_PARAMETER); + event_type + 1); // **************************************************************** EC_Counting_Supplier any_source_supplier; any_source_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); any_source_supplier.connect (supplier_admin.in (), 0, event_type, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); // **************************************************************** EC_Counting_Supplier any_type_supplier; any_type_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); any_type_supplier.connect (supplier_admin.in (), event_source, 0, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); // **************************************************************** EC_Counting_Supplier wildcard_supplier; wildcard_supplier.activate (consumer_admin.in (), - milliseconds - ACE_ENV_ARG_PARAMETER); + milliseconds); wildcard_supplier.connect (supplier_admin.in (), 0, 0, event_source, - event_type - ACE_ENV_ARG_PARAMETER); + event_type); // **************************************************************** @@ -140,8 +129,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, event_type, 0); regular_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -157,8 +145,7 @@ main (int argc, char* argv[]) consumer_qos.insert (event_source, 0, 0); any_type_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -174,8 +161,7 @@ main (int argc, char* argv[]) consumer_qos.insert (0, event_type, 0); any_source_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -191,8 +177,7 @@ main (int argc, char* argv[]) consumer_qos.insert (0, 0, 0); wildcard_consumer.connect (consumer_admin.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } // **************************************************************** @@ -232,7 +217,7 @@ main (int argc, char* argv[]) // **************************************************************** - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); orb->destroy (); @@ -270,11 +255,10 @@ main (int argc, char* argv[]) + supplier.event_count; regular_consumer.dump_results (expected, 5); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp index 64bd7e250f3..5988fdd7ce0 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.cpp @@ -22,15 +22,14 @@ EC_Wrapper::create (void) EC_Wrapper::~EC_Wrapper (void) { - ACE_TRY_NEW_ENV + try { this->destroy_ec (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // ignore } - ACE_ENDTRY; } int @@ -58,18 +57,16 @@ EC_Wrapper::init (CORBA::ORB_ptr orb, -1); auto_ptr<TAO_EC_Event_Channel> impl_release (impl); - ACE_TRY_NEW_ENV + try { impl->activate (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Suppressed the following exception " - "in EC_Wrapper::init:\n"); + ex._tao_print_exception ( + "Suppressed the following exception ""in EC_Wrapper::init:\n"); return -1; } - ACE_ENDTRY; this->ec_impl_ = impl_release.release (); return 0; @@ -115,44 +112,41 @@ EC_Wrapper::destroy (void) // Deregister from POA. this->deactivator_.deactivate (); - ACE_TRY + try { this->destroy_ec (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { this->orb_->shutdown (); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; this->orb_->shutdown (); } RtecEventChannelAdmin::Observer_Handle -EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer - ACE_ENV_ARG_DECL) +EC_Wrapper::append_observer (RtecEventChannelAdmin::Observer_ptr observer) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)) { if (this->ec_impl_) - return this->ec_impl_->append_observer (observer ACE_ENV_ARG_PARAMETER); + return this->ec_impl_->append_observer (observer); else ACE_THROW_RETURN (CORBA::OBJECT_NOT_EXIST (), 0); } void -EC_Wrapper::remove_observer (RtecEventChannelAdmin::Observer_Handle handle - ACE_ENV_ARG_DECL) +EC_Wrapper::remove_observer (RtecEventChannelAdmin::Observer_Handle handle) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_REMOVE_OBSERVER)) { if (this->ec_impl_) - this->ec_impl_->remove_observer (handle ACE_ENV_ARG_PARAMETER); + this->ec_impl_->remove_observer (handle); else - ACE_THROW (CORBA::OBJECT_NOT_EXIST ()); + throw CORBA::OBJECT_NOT_EXIST (); } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h index 0cb0b2407d6..adc71f8e9b5 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/EC_Wrapper.h @@ -56,14 +56,12 @@ public: ACE_THROW_SPEC ((CORBA::SystemException)); virtual RtecEventChannelAdmin::Observer_Handle - append_observer (RtecEventChannelAdmin::Observer_ptr observer - ACE_ENV_ARG_DECL) + append_observer (RtecEventChannelAdmin::Observer_ptr observer) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, RtecEventChannelAdmin::EventChannel::CANT_APPEND_OBSERVER)); - virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle - ACE_ENV_ARG_DECL) + virtual void remove_observer (RtecEventChannelAdmin::Observer_Handle) ACE_THROW_SPEC (( CORBA::SystemException, RtecEventChannelAdmin::EventChannel::SYNCHRONIZATION_ERROR, diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp index a9f0c8d0fbf..23c8c23cbff 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.cpp @@ -55,12 +55,11 @@ Gateway_EC::parse_args (int argc, char *argv []) void Gateway_EC::write_ior_file (CORBA::ORB_ptr orb, - RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) + RtecEventChannelAdmin::EventChannel_ptr ec) { // Write EC ior to a file. CORBA::String_var str; - str = orb->object_to_string (ec ACE_ENV_ARG_PARAMETER); + str = orb->object_to_string (ec); FILE *output_file= ACE_OS::fopen (this->ec_ior_file_, "w"); if (output_file == 0) @@ -68,7 +67,7 @@ Gateway_EC::write_ior_file (CORBA::ORB_ptr orb, ACE_ERROR ((LM_ERROR, "Cannot open output file for writing IOR: %s", this->ec_ior_file_)); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } ACE_OS::fprintf (output_file, "%s", str.in ()); @@ -85,20 +84,20 @@ Gateway_EC::run (int argc, char ** argv) TAO_EC_ORB_Holder orb_destroyer; - ACE_TRY_NEW_ENV + try { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); orb_destroyer.init (orb); if (parse_args (argc, argv) == -1) return -1; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (check_for_nil (poa.in (), "POA") == -1) return -1; PortableServer::POAManager_var manager = @@ -119,11 +118,10 @@ Gateway_EC::run (int argc, char ** argv) activate (ec, poa.in (), ec_wrapper.in (), - ec_deactivator - ACE_ENV_ARG_PARAMETER); + ec_deactivator); ec_wrapper->set_deactivator (ec_deactivator); - this->write_ior_file (orb.in (), ec.in () ACE_ENV_ARG_PARAMETER); + this->write_ior_file (orb.in (), ec.in ()); // Set up multicast components. // Obtain mcast gateway from service configurator. @@ -133,19 +131,17 @@ Gateway_EC::run (int argc, char ** argv) if (!gateway) { - ACE_TRY_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } - gateway->run (orb.in (), ec.in () ACE_ENV_ARG_PARAMETER); + gateway->run (orb.in (), ec.in ()); // Run server. orb->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Unexpected Exception in Gateway EC:"); + ex._tao_print_exception ("Unexpected Exception in Gateway EC:"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h index 1db97bc26de..801040fa6d4 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h +++ b/TAO/orbsvcs/tests/Event/Mcast/Common/Gateway_EC.h @@ -37,8 +37,7 @@ private: int parse_args (int argc, char *argv[]); int check_for_nil (CORBA::Object_ptr obj, const char *message); void write_ior_file (CORBA::ORB_ptr orb, - RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + RtecEventChannelAdmin::EventChannel_ptr ec); //@} /// Event Channel ior is written to this file. diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp index 440bad5455f..365939b8c4d 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/consumer.cpp @@ -19,8 +19,7 @@ public: //@{ /// Logs each event. Initiates shutdown after receiving 100 events /// of each type. - virtual void push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)); /// No-op. @@ -57,8 +56,7 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb, } void -EC_Consumer::push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL) +EC_Consumer::push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < events.length (); ++i) @@ -113,7 +111,7 @@ EC_Consumer::disconnect (void) this->ec_->destroy (); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //////////////////////////////////////////////////////////// @@ -138,19 +136,19 @@ parse_args (int /* argc */, char ** /* argv */) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) == -1) return 1; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (check_for_nil (poa.in (), "POA") == -1) return 1; @@ -158,10 +156,9 @@ main (int argc, char *argv[]) poa->the_POAManager (); // Obtain reference to EC. - obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER); + obj = orb->resolve_initial_references ("Event_Service"); RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()); if (check_for_nil (ec.in (), "EC") == -1) return 1; @@ -177,8 +174,7 @@ main (int argc, char *argv[]) activate (consumer, poa.in (), consumer_impl.in (), - consumer_deactivator - ACE_ENV_ARG_PARAMETER); + consumer_deactivator); consumer_deactivator.disallow_deactivation (); // Obtain reference to ConsumerAdmin. @@ -195,8 +191,7 @@ main (int argc, char *argv[]) qos.insert_type (B_EVENT_TYPE, 0); qos.insert_type (C_EVENT_TYPE, 0); supplier->connect_push_consumer (consumer.in (), - qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_ConsumerQOS ()); // Allow processing of CORBA requests. manager->activate (); @@ -204,13 +199,11 @@ main (int argc, char *argv[]) // Receive events from EC. orb->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in Consumer:"); + ex._tao_print_exception ("Exception in Consumer:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp index 0d93222b9ea..2945e468ffc 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Complex/supplier.cpp @@ -7,8 +7,7 @@ #include "ace/Log_Msg.h" void -send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer - ACE_ENV_ARG_DECL) +send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer) { // Events we'll send. RtecEventComm::EventSet events (1); @@ -22,13 +21,13 @@ send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer { // Send 1 event of each type. events[0].header.type = A_EVENT_TYPE; - consumer->push (events ACE_ENV_ARG_PARAMETER); + consumer->push (events); events[0].header.type = B_EVENT_TYPE; - consumer->push (events ACE_ENV_ARG_PARAMETER); + consumer->push (events); events[0].header.type = C_EVENT_TYPE; - consumer->push (events ACE_ENV_ARG_PARAMETER); + consumer->push (events); } } @@ -53,22 +52,20 @@ parse_args (int /*argc*/, char ** /*argv*/) int main (int argc, char *argv[]) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // Initialize ORB and parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) == -1) return 1; // Obtain reference to EC. CORBA::Object_var obj = - orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("Event_Service"); RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()); if (check_for_nil (ec.in (), "EC") == -1) return 1; @@ -87,23 +84,20 @@ main (int argc, char *argv[]) consumer->connect_push_supplier (RtecEventComm::PushSupplier::_nil (), - qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_SupplierQOS ()); // Send events to EC. - send_events (consumer.in () ACE_ENV_ARG_PARAMETER); + send_events (consumer.in ()); // Tell EC to shut down. ec->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in Supplier:"); + ex._tao_print_exception ("Exception in Supplier:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp index 1221a97921a..473802c28d6 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/consumer.cpp @@ -18,8 +18,7 @@ public: /// PushConsumer methods. //@{ /// Logs each event. Initiates shutdown after receiving 100 events. - virtual void push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)); /// No-op. virtual void disconnect_push_consumer (void) @@ -49,8 +48,7 @@ EC_Consumer::EC_Consumer (CORBA::ORB_var orb, } void -EC_Consumer::push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL) +EC_Consumer::push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < events.length (); ++i) @@ -80,7 +78,7 @@ EC_Consumer::disconnect (void) this->ec_->destroy (); - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } //////////////////////////////////////////////////////////// @@ -105,19 +103,19 @@ parse_args (int /* argc */, char ** /* argv */) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) == -1) return 1; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (check_for_nil (poa.in (), "POA") == -1) return 1; @@ -125,10 +123,9 @@ main (int argc, char *argv[]) poa->the_POAManager (); // Obtain reference to EC. - obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER); + obj = orb->resolve_initial_references ("Event_Service"); RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()); if (check_for_nil (ec.in (), "EC") == -1) return 1; @@ -144,8 +141,7 @@ main (int argc, char *argv[]) activate (consumer, poa.in (), consumer_impl.in (), - consumer_deactivator - ACE_ENV_ARG_PARAMETER); + consumer_deactivator); consumer_deactivator.disallow_deactivation (); // Obtain reference to ConsumerAdmin. @@ -160,8 +156,7 @@ main (int argc, char *argv[]) qos.start_disjunction_group (1); qos.insert_type (ACE_ES_EVENT_ANY, 0); supplier->connect_push_consumer (consumer.in (), - qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_ConsumerQOS ()); // Allow processing of CORBA requests. manager->activate (); @@ -169,13 +164,11 @@ main (int argc, char *argv[]) // Receive events from EC. orb->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in Consumer:"); + ex._tao_print_exception ("Exception in Consumer:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp index 307e6176a95..dddfe6c6d60 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Simple/supplier.cpp @@ -7,8 +7,7 @@ #include "ace/Log_Msg.h" void -send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer - ACE_ENV_ARG_DECL) +send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer) { RtecEventComm::EventSet events (1); events.length (1); @@ -20,7 +19,7 @@ send_events (RtecEventChannelAdmin::ProxyPushConsumer_ptr consumer for (int i = 0; i < 100; ++i) { - consumer->push (events ACE_ENV_ARG_PARAMETER); + consumer->push (events); } } @@ -45,21 +44,20 @@ parse_args (int /*argc*/, char ** /*argv*/) int main (int argc, char *argv[]) { - ACE_TRY_NEW_ENV + try { // Initialize ORB and parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) == -1) return 1; // Obtain reference to EC. CORBA::Object_var obj = - orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("Event_Service"); RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()); if (check_for_nil (ec.in (), "EC") == -1) return 1; @@ -76,23 +74,20 @@ main (int argc, char *argv[]) consumer->connect_push_supplier (RtecEventComm::PushSupplier::_nil (), - qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_SupplierQOS ()); // Send 100 events to EC. - send_events (consumer.in () ACE_ENV_ARG_PARAMETER); + send_events (consumer.in ()); // Tell EC to shut down. ec->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in Supplier:"); + ex._tao_print_exception ("Exception in Supplier:"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp index cb529dba339..4b1da1ae0a0 100644 --- a/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp +++ b/TAO/orbsvcs/tests/Event/Mcast/Two_Way/application.cpp @@ -56,8 +56,7 @@ public: // will not have a chance to execute, it is the responsibility of // the user.) void init (CORBA::ORB_var orb, - RtecEventChannelAdmin::EventChannel_var ec - ACE_ENV_ARG_DECL); + RtecEventChannelAdmin::EventChannel_var ec); // No-op if the object hasn't been fully initialized. Otherwise, // deregister from reactor and poa, destroy ec or just disconnect from it @@ -72,8 +71,7 @@ public: /// PushConsumer methods. //@{ /// Update our <heartbeats_> database to reflect newly received heartbeats. - virtual void push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC((CORBA::SystemException)); /// Initiate shutdown(). @@ -221,13 +219,12 @@ Heartbeat_Application::check_args (CORBA::ORB_var orb, void Heartbeat_Application::init (CORBA::ORB_var orb, - RtecEventChannelAdmin::EventChannel_var ec - ACE_ENV_ARG_DECL) + RtecEventChannelAdmin::EventChannel_var ec) { // Verify arguments. if (this->check_args (orb, ec) == -1) { - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Get hostname & process id, i.e., identity of this application. @@ -243,23 +240,22 @@ Heartbeat_Application::init (CORBA::ORB_var orb, ACE_ERROR ((LM_ERROR, "Heartbeat_Application::init - " "cannot get hostname\n")); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } // Connect to EC as a supplier. this->connect_as_supplier (); // Connect to EC as a consumer. - ACE_TRY + try { this->connect_as_consumer (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { this->consumer_proxy_disconnect_.execute (); - ACE_RE_THROW; + throw; } - ACE_ENDTRY; // Register for reactor timeouts. if (this->register_for_timeouts () == -1) @@ -267,7 +263,7 @@ Heartbeat_Application::init (CORBA::ORB_var orb, this->consumer_proxy_disconnect_.execute (); this->supplier_proxy_disconnect_.execute (); this->deactivator_.deactivate (); - ACE_THROW (CORBA::INTERNAL ()); + throw CORBA::INTERNAL (); } this->initialized_ = 1; @@ -322,8 +318,7 @@ Heartbeat_Application::connect_as_supplier (void) qos.insert (SOURCE_ID, HEARTBEAT, 0, 1); proxy->connect_push_supplier (RtecEventComm::PushSupplier::_nil (), - qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_SupplierQOS ()); // Update resource managers. this->consumer_ = proxy._retn (); @@ -341,8 +336,7 @@ Heartbeat_Application::connect_as_consumer (void) activate (consumer_ref, poa.in (), this, - deactivator - ACE_ENV_ARG_PARAMETER); + deactivator); // Obtain reference to ConsumerAdmin. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = @@ -358,8 +352,7 @@ Heartbeat_Application::connect_as_consumer (void) qos.start_disjunction_group (1); qos.insert_type (ACE_ES_EVENT_ANY, 0); proxy->connect_push_consumer (consumer_ref.in (), - qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + qos.get_ConsumerQOS ()); // Update resource managers. this->supplier_proxy_disconnect_.set_command (new_proxy_disconnect); @@ -370,7 +363,7 @@ int Heartbeat_Application::handle_timeout (const ACE_Time_Value&, const void*) { - ACE_TRY_NEW_ENV + try { if (this->n_timeouts_++ < HEARTBEATS_TO_SEND) { @@ -389,7 +382,7 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&, (u_char *)this->hostname_and_pid_, 0); - this->consumer_->push (events ACE_ENV_ARG_PARAMETER); + this->consumer_->push (events); } else // We already sent the required number of heartbeats. Time to @@ -398,19 +391,16 @@ Heartbeat_Application::handle_timeout (const ACE_Time_Value&, this->shutdown (); } } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Suppressed the following exception in " - "Heartbeat_Application::handle_timeout:\n"); + ex._tao_print_exception ( + "Suppressed the following exception in ""Heartbeat_Application::handle_timeout:\n"); } - ACE_ENDTRY; return 0; } void -Heartbeat_Application::push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL_NOT_USED) +Heartbeat_Application::push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC((CORBA::SystemException)) { for (CORBA::ULong i = 0; i < events.length (); ++i) @@ -467,17 +457,15 @@ Heartbeat_Application::destroy_ec (void) { if (!CORBA::is_nil (this->ec_.in ())) { - ACE_TRY_NEW_ENV + try { this->ec_->destroy (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Suppressed the following exception in " - "Application_Heartbeat::destroy_ec\n"); + ex._tao_print_exception ( + "Suppressed the following exception in ""Application_Heartbeat::destroy_ec\n"); } - ACE_ENDTRY; this->ec_ = RtecEventChannelAdmin::EventChannel::_nil (); } @@ -529,17 +517,15 @@ Heartbeat_Application::shutdown (void) } // Shutdown the ORB. - ACE_TRY_NEW_ENV + try { - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "The following exception occured in " - "Heartbeat_Application::shutdown:\n"); + ex._tao_print_exception ( + "The following exception occured in ""Heartbeat_Application::shutdown:\n"); } - ACE_ENDTRY; } //////////////////////////////////////////////////////////// @@ -589,19 +575,19 @@ main (int argc, char *argv[]) // We may want this to be alive beyond the next block. TAO_EC_Servant_Var<Heartbeat_Application> app; - ACE_TRY_NEW_ENV + try { // Initialize ORB and POA, POA Manager, parse args. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); if (parse_args (argc, argv) == -1) return 1; CORBA::Object_var obj = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (obj.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (obj.in ()); if (check_for_nil (poa.in (), "POA") == -1) return 1; @@ -609,10 +595,9 @@ main (int argc, char *argv[]) poa->the_POAManager (); // Obtain reference to EC. - obj = orb->resolve_initial_references ("Event_Service" ACE_ENV_ARG_PARAMETER); + obj = orb->resolve_initial_references ("Event_Service"); RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (obj.in () - ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (obj.in ()); if (check_for_nil (ec.in (), "EC") == -1) return 1; @@ -621,7 +606,7 @@ main (int argc, char *argv[]) if (!app.in ()) return 1; - app->init (orb, ec ACE_ENV_ARG_PARAMETER); + app->init (orb, ec); // Allow processing of CORBA requests. manager->activate (); @@ -629,16 +614,14 @@ main (int argc, char *argv[]) // Receive events from EC. orb->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Exception in Heartbeat Application:"); + ex._tao_print_exception ("Exception in Heartbeat Application:"); // Since there was an exception, application might not have had // a chance to shutdown. app->shutdown (); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index 8fdeeeb0f6e..9d49de34f95 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -111,13 +111,11 @@ EC_Connect::dump_results (void) void EC_Connect::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i - ACE_ENV_ARG_DECL) + int i) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Driver::connect_consumer (consumer_admin, - i - ACE_ENV_ARG_PARAMETER); + i); ACE_hrtime_t now = ACE_OS::gethrtime (); this->consumer_connect_.sample (now - this->start_time_, now - start); @@ -126,13 +124,11 @@ EC_Connect::connect_consumer ( void EC_Connect::connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - int i - ACE_ENV_ARG_DECL) + int i) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Driver::connect_supplier (supplier_admin, - i - ACE_ENV_ARG_PARAMETER); + i); ACE_hrtime_t now = ACE_OS::gethrtime (); this->supplier_connect_.sample (now - this->start_time_, now - start); @@ -185,11 +181,11 @@ EC_Connect::connect_clients (void) { if (i < this->n_consumers_) { - this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER); + this->connect_consumer (consumer_admin.in (), i); } if (i < this->n_suppliers_) { - this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER); + this->connect_supplier (supplier_admin.in (), i); } } @@ -308,25 +304,21 @@ void ECC_Consumer::connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL) + int shutdown_event_type) { this->EC_Consumer::connect (consumer_admin, qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); } void ECC_Consumer::connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL) + int shutdown_event_type) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Consumer::connect (qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); ACE_hrtime_t now = ACE_OS::gethrtime (); this->connect_time_.sample (now, now - start); } @@ -350,25 +342,21 @@ void ECC_Supplier::connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL) + int shutdown_event_type) { this->EC_Supplier::connect (supplier_admin, qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); } void ECC_Supplier::connect ( const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL) + int shutdown_event_type) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Supplier::connect (qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); ACE_hrtime_t now = ACE_OS::gethrtime (); this->connect_time_.sample (now, now - start); } diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.h b/TAO/orbsvcs/tests/Event/Performance/Connect.h index 91e22f1d8d7..03e7896e3da 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.h +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h @@ -58,12 +58,10 @@ public: virtual void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i - ACE_ENV_ARG_DECL); + int i); virtual void connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - int i - ACE_ENV_ARG_DECL); + int i); virtual void disconnect_consumers (void); virtual void disconnect_suppliers (void); @@ -94,12 +92,10 @@ public: virtual void connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL); + int shutdown_event_type); virtual void connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL); + int shutdown_event_type); virtual void dump_results (const char* name, ACE_UINT32 global_scale_factor); @@ -117,12 +113,10 @@ public: virtual void connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL); + int shutdown_event_type); virtual void connect ( const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL); + int shutdown_event_type); virtual void dump_results (const char* name, ACE_UINT32 global_scale_factor); diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp index f2bc579fd69..a8a4c1c9eee 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -68,8 +68,7 @@ EC_Inversion::connect_consumers (void) this->consumers_[0]->connect (consumer_admin.in (), qos0.get_ConsumerQOS (), - ACE_ES_EVENT_UNDEFINED + 1 - ACE_ENV_ARG_PARAMETER); + ACE_ES_EVENT_UNDEFINED + 1); for (int i = 1; i < this->n_consumers_; ++i) { @@ -84,8 +83,7 @@ EC_Inversion::connect_consumers (void) this->consumers_[i]->connect (consumer_admin.in (), qos1.get_ConsumerQOS (), - base_event + 1 - ACE_ENV_ARG_PARAMETER); + base_event + 1); } if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) connected consumer(s)\n")); @@ -103,8 +101,7 @@ EC_Inversion::connect_suppliers (void) this->suppliers_[0]->connect (supplier_admin.in (), qos0.get_SupplierQOS (), - ACE_ES_EVENT_UNDEFINED + 1 - ACE_ENV_ARG_PARAMETER); + ACE_ES_EVENT_UNDEFINED + 1); for (int j = 1; j != this->n_suppliers_; ++j) { @@ -118,8 +115,7 @@ EC_Inversion::connect_suppliers (void) this->suppliers_[j]->connect (supplier_admin.in (), qos1.get_SupplierQOS (), - base_event + 1 - ACE_ENV_ARG_PARAMETER); + base_event + 1); } if (this->verbose ()) diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 9ac0e220da9..39d220bae76 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -47,19 +47,17 @@ main (int argc, char *argv []) "server (%P|%t): sched_params failed\n")); } - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in () - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (manager_object.in ()); CORBA::Any sync_scope; sync_scope <<= Messaging::SYNC_WITH_TARGET; @@ -68,11 +66,9 @@ main (int argc, char *argv []) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope - ACE_ENV_ARG_PARAMETER); + sync_scope); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); #else ACE_DEBUG ((LM_DEBUG, "CORBA Messaging disabled in this configuration," @@ -80,7 +76,7 @@ main (int argc, char *argv []) #endif /* TAO_HAS_MESSAGING */ CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -88,7 +84,7 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -100,11 +96,10 @@ main (int argc, char *argv []) // Get the event channel object reference CORBA::Object_var object = - orb->string_to_object (ec_ior ACE_ENV_ARG_PARAMETER); + orb->string_to_object (ec_ior); RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (object.in () - ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (object.in ()); if (CORBA::is_nil (ec.in ())) { ACE_ERROR ((LM_ERROR, @@ -148,8 +143,7 @@ main (int argc, char *argv []) h1.source = ACE_ES_EVENT_SOURCE_ANY; proxy_supplier->connect_push_consumer (consumer_reference.in (), - consumer_qos - ACE_ENV_ARG_PARAMETER); + consumer_qos); ACE_DEBUG ((LM_DEBUG, "Connected consumer\n")); @@ -176,8 +170,7 @@ main (int argc, char *argv []) sh0.source = 1; // first free event source proxy_consumer->connect_push_supplier (supplier_reference.in (), - supplier_qos - ACE_ENV_ARG_PARAMETER); + supplier_qos); ACE_DEBUG ((LM_DEBUG, "Connected supplier\n")); @@ -189,7 +182,7 @@ main (int argc, char *argv []) while (!task.done () || !consumer.done ()) { ACE_Time_Value tv (1, 0); - orb->run (tv ACE_ENV_ARG_PARAMETER); + orb->run (tv); } ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -225,19 +218,18 @@ main (int argc, char *argv []) PortableServer::ObjectId_var id; - id = root_poa->servant_to_id (&consumer ACE_ENV_ARG_PARAMETER); - root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + id = root_poa->servant_to_id (&consumer); + root_poa->deactivate_object (id.in ()); - id = root_poa->servant_to_id (&supplier ACE_ENV_ARG_PARAMETER); - root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + id = root_poa->servant_to_id (&supplier); + root_poa->deactivate_object (id.in ()); orb->destroy (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, argv[0]); + ex._tao_print_exception (argv[0]); } - ACE_ENDTRY; return 0; } @@ -297,8 +289,7 @@ EC_Latency_Consumer::done (void) } void -EC_Latency_Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL_NOT_USED) +EC_Latency_Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t creation; @@ -354,7 +345,7 @@ Task::done (void) int Task::svc (void) { - ACE_TRY_NEW_ENV + try { RtecEventComm::EventSet event (1); event.length (1); @@ -368,7 +359,7 @@ Task::svc (void) ACE_hrtime_t creation = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); - this->consumer_->push (event ACE_ENV_ARG_PARAMETER); + this->consumer_->push (event); // ACE_Time_Value tv (0, 5000); // ACE_OS::sleep (tv); @@ -385,10 +376,9 @@ Task::svc (void) return 0; } } - ACE_CATCH (CORBA::SystemException, ex) + catch (const CORBA::SystemException& ex) { - ACE_PRINT_EXCEPTION (ex, "Task::svc"); + ex._tao_print_exception ("Task::svc"); } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h index 2008d7f09fb..b88d5855ba1 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.h +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h @@ -41,8 +41,7 @@ public: /// Return 1 when all the messages have been received int done (void); - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL_NOT_USED) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp index 30f9eae7f9b..668480f86b2 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -46,19 +46,17 @@ main (int argc, char *argv []) "server (%P|%t): sched_params failed\n")); } - ACE_TRY_NEW_ENV + try { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("ORBPolicyManager"); CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in () - ACE_ENV_ARG_PARAMETER); + CORBA::PolicyManager::_narrow (manager_object.in ()); CORBA::Any sync_scope; sync_scope <<= Messaging::SYNC_WITH_TARGET; @@ -67,11 +65,9 @@ main (int argc, char *argv []) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope - ACE_ENV_ARG_PARAMETER); + sync_scope); policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::SET_OVERRIDE); #else ACE_DEBUG ((LM_DEBUG, "CORBA Messaging disabled in this configuration," @@ -79,7 +75,7 @@ main (int argc, char *argv []) #endif /* TAO_HAS_MESSAGING */ CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) ACE_ERROR_RETURN ((LM_ERROR, @@ -87,7 +83,7 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = root_poa->the_POAManager (); @@ -106,7 +102,7 @@ main (int argc, char *argv []) ec_impl._this (); CORBA::String_var str = - orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER); + orb->object_to_string (ec.in ()); if (ior_file_name != 0) { @@ -123,16 +119,15 @@ main (int argc, char *argv []) orb->run (); PortableServer::ObjectId_var id = - root_poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER); - root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + root_poa->servant_to_id (&ec_impl); + root_poa->deactivate_object (id.in ()); orb->destroy (); } - ACE_CATCH (CORBA::Exception, ex) + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ex, argv[0]); + ex._tao_print_exception (argv[0]); } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp index 05fd4d9c983..c7ba18ae47b 100644 --- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.cpp @@ -11,8 +11,7 @@ AddrServer::AddrServer (const RtecUDPAdmin::UDP_Addr& addr) void AddrServer::get_addr (const RtecEventComm::EventHeader&, - RtecUDPAdmin::UDP_Addr_out addr - ACE_ENV_ARG_DECL_NOT_USED) + RtecUDPAdmin::UDP_Addr_out addr) ACE_THROW_SPEC ((CORBA::SystemException)) { addr = this->addr_; diff --git a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h index 8439914f22b..deeced433db 100644 --- a/TAO/orbsvcs/tests/Event/UDP/AddrServer.h +++ b/TAO/orbsvcs/tests/Event/UDP/AddrServer.h @@ -40,8 +40,7 @@ public: // = The RtecUDPAdmin::AddrServer methods virtual void get_addr (const RtecEventComm::EventHeader& header, - RtecUDPAdmin::UDP_Addr_out addr - ACE_ENV_ARG_DECL_NOT_USED) + RtecUDPAdmin::UDP_Addr_out addr) ACE_THROW_SPEC ((CORBA::SystemException)); private: diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp index 8e06bcecd75..21347a34e9f 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.cpp @@ -23,8 +23,7 @@ Consumer::event_count (void) const } void -Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL) +Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin) { this->proxy_ = consumer_admin->obtain_push_supplier (); @@ -48,23 +47,21 @@ Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin h1.type = ACE_ES_EVENT_UNDEFINED; // first free event type h1.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK - this->proxy_->connect_push_consumer (me.in (), qos - ACE_ENV_ARG_PARAMETER); + this->proxy_->connect_push_consumer (me.in (), qos); } void Consumer::disconnect (void) { - ACE_TRY + try { // Disconnect from the proxy this->proxy_->disconnect_push_supplier (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { // Ignore exceptions } - ACE_ENDTRY; this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); // Deactivate this object @@ -72,14 +69,13 @@ Consumer::disconnect (void) this->_default_POA (); // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); // Deactivate the object - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in ()); } void -Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL_NOT_USED) +Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) diff --git a/TAO/orbsvcs/tests/Event/UDP/Consumer.h b/TAO/orbsvcs/tests/Event/UDP/Consumer.h index 5a8fa58df14..0442a5ff6e2 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Consumer.h +++ b/TAO/orbsvcs/tests/Event/UDP/Consumer.h @@ -37,8 +37,7 @@ public: Consumer (bool valuetype); // Constructor - void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin); // Connect to the Event Channel void disconnect (void); @@ -46,8 +45,7 @@ public: // = The RtecEventComm::PushConsumer methods - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp index 8317c9e6c63..e13fc1e2903 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.cpp @@ -13,8 +13,7 @@ Supplier::Supplier (bool valuetype) : valuetype_ (valuetype), event_count_ (0) } void -Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin - ACE_ENV_ARG_DECL) +Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin) { this->proxy_ = supplier_admin->obtain_push_consumer (); @@ -33,28 +32,26 @@ Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin h0.type = ACE_ES_EVENT_UNDEFINED; // first free event type h0.source = 1; // first free event source - this->proxy_->connect_push_supplier (me.in (), qos - ACE_ENV_ARG_PARAMETER); + this->proxy_->connect_push_supplier (me.in (), qos); } void Supplier::disconnect (void) { // Disconnect from the EC - ACE_TRY + try { this->proxy_->disconnect_push_consumer (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (id.in ()); } void @@ -66,7 +63,7 @@ Supplier::insert_into_any (CORBA::Any& any, Components::EventBase* vb) void Supplier::perform_push (void) { - ACE_TRY + try { // The event type and source must match our publications ++event_count_; @@ -90,12 +87,11 @@ Supplier::perform_push (void) event[0].data.any_value <<= CORBA::string_dup( "ACE/TAO/CIAO"); } - this->proxy_->push (event ACE_ENV_ARG_PARAMETER); + this->proxy_->push (event); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { } - ACE_ENDTRY; } void diff --git a/TAO/orbsvcs/tests/Event/UDP/Supplier.h b/TAO/orbsvcs/tests/Event/UDP/Supplier.h index 99f71afca5f..f8de21817f6 100644 --- a/TAO/orbsvcs/tests/Event/UDP/Supplier.h +++ b/TAO/orbsvcs/tests/Event/UDP/Supplier.h @@ -39,8 +39,7 @@ public: Supplier (bool valuetype); // Constructor - void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin); // Connect to the event channel void disconnect (void); diff --git a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp index 383bde44a26..b00d2680fce 100644 --- a/TAO/orbsvcs/tests/Event/UDP/receiver.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/receiver.cpp @@ -38,18 +38,17 @@ main (int argc, char* argv[]) // and defined in $ACE_ROOT/ace/CORBA_macros.h. // If your platform supports native exceptions, and TAO was compiled // with native exception support then you can simply use try/catch - // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument. + // and avoid the argument. // Unfortunately many embedded systems cannot use exceptions due to // the space and time overhead. // - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // **************** HERE STARTS THE ORB SETUP // Create the ORB, pass the argv list for parsing. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse the arguments, you usually want to do this after // invoking ORB_init() because ORB_init() will remove all the @@ -69,8 +68,7 @@ main (int argc, char* argv[]) 1); // supplied by mapping orb->register_value_factory (vb_factory->tao_repository_id (), - vb_factory - ACE_ENV_ARG_PARAMETER); + vb_factory); vb_factory->_remove_ref (); // release ownership } @@ -79,9 +77,9 @@ main (int argc, char* argv[]) // The POA starts in the holding state, if it is not activated // it will not process any requests. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -178,16 +176,14 @@ main (int argc, char* argv[]) // required by all the local consumer. // Then it register for the multicast groups that carry those // events: - mcast_eh.open (event_channel.in () - ACE_ENV_ARG_PARAMETER); + mcast_eh.open (event_channel.in ()); // Again the receiver connects to the event channel as a // supplier of events, using the Observer features to detect // local consumers and their interests: receiver->init (event_channel.in (), endpoint, - address_server.in () - ACE_ENV_ARG_PARAMETER); + address_server.in ()); // The Receiver is also a supplier of events. The exact type of // events is only known to the application, because it depends @@ -206,7 +202,7 @@ main (int argc, char* argv[]) pub.publications[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; pub.is_gateway = 1; - receiver->connect (pub ACE_ENV_ARG_PARAMETER); + receiver->connect (pub); // **************** THAT COMPLETES THE FEDERATION SETUP @@ -217,8 +213,7 @@ main (int argc, char* argv[]) Consumer consumer (valuetype); RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = event_channel->for_consumers (); - consumer.connect (consumer_admin.in () - ACE_ENV_ARG_PARAMETER); + consumer.connect (consumer_admin.in ()); // **************** THAT COMPLETES THE CLIENT SETUP @@ -238,7 +233,7 @@ main (int argc, char* argv[]) // perform_work() or work_pending(), so just calling // them results in a spin loop. ACE_Time_Value tv (0, 50000); - orb->perform_work (tv ACE_ENV_ARG_PARAMETER); + orb->perform_work (tv); } ACE_Time_Value tv (0, 100000); ACE_OS::sleep (tv); @@ -282,14 +277,14 @@ main (int argc, char* argv[]) ec_impl._default_POA (); // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (&ec_impl); // Deactivate the object - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in ()); } // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // Finally destroy the ORB orb->destroy (); @@ -299,12 +294,11 @@ main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "UDP receiver ready\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/UDP/sender.cpp b/TAO/orbsvcs/tests/Event/UDP/sender.cpp index 2de064826ac..d8b7ee230a2 100644 --- a/TAO/orbsvcs/tests/Event/UDP/sender.cpp +++ b/TAO/orbsvcs/tests/Event/UDP/sender.cpp @@ -37,18 +37,17 @@ main (int argc, char* argv[]) // and defined in $ACE_ROOT/ace/CORBA_macros.h. // If your platform supports native exceptions, and TAO was compiled // with native exception support then you can simply use try/catch - // and avoid the ACE_ENV_SINGLE_ARG_PARAMETER argument. + // and avoid the argument. // Unfortunately many embedded systems cannot use exceptions due to // the space and time overhead. // - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { // **************** HERE STARTS THE ORB SETUP // Create the ORB, pass the argv list for parsing. CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); // Parse the arguments, you usually want to do this after // invoking ORB_init() because ORB_init() will remove all the @@ -65,9 +64,9 @@ main (int argc, char* argv[]) // The POA starts in the holding state, if it is not activated // it will not process any requests. CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA"); PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in ()); PortableServer::POAManager_var poa_manager = poa->the_POAManager (); poa_manager->activate (); @@ -149,8 +148,7 @@ main (int argc, char* argv[]) TAO_EC_Servant_Var<TAO_ECG_UDP_Sender> sender = TAO_ECG_UDP_Sender::create(); sender->init (event_channel.in (), address_server.in (), - endpoint - ACE_ENV_ARG_PARAMETER); + endpoint); // Now we connect the sender as a consumer of events, it will // receive any event from any source and send it to the "right" @@ -164,7 +162,7 @@ main (int argc, char* argv[]) sub.dependencies[0].event.header.source = ACE_ES_EVENT_SOURCE_ANY; // Any source is OK - sender->connect (sub ACE_ENV_ARG_PARAMETER); + sender->connect (sub); // **************** THAT COMPLETES THE FEDERATION SETUP @@ -174,8 +172,7 @@ main (int argc, char* argv[]) Supplier supplier (valuetype); RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = event_channel->for_suppliers (); - supplier.connect (supplier_admin.in () - ACE_ENV_ARG_PARAMETER); + supplier.connect (supplier_admin.in ()); // **************** THAT COMPLETES THE CLIENT SETUP @@ -195,7 +192,7 @@ main (int argc, char* argv[]) // perform_work() or work_pending(), so just calling // them results in a spin loop. ACE_Time_Value tv (0, 50000); - orb->perform_work (tv ACE_ENV_ARG_PARAMETER); + orb->perform_work (tv); } ACE_Time_Value tv (0, 100000); ACE_OS::sleep (tv); @@ -229,14 +226,14 @@ main (int argc, char* argv[]) ec_impl._default_POA (); // Get the Object Id used for the servant.. PortableServer::ObjectId_var oid = - poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (&ec_impl); // Deactivate the object - poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in ()); } // Now we can destroy the POA, the flags mean that we want to // wait until the POA is really destroyed - poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + poa->destroy (1, 1); // Finally destroy the ORB orb->destroy (); @@ -246,12 +243,11 @@ main (int argc, char* argv[]) ACE_DEBUG ((LM_DEBUG, "UDP sender ready\n")); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Service"); + ex._tao_print_exception ("Service"); return 1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index 7306d2685ac..f94031f8750 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -24,20 +24,18 @@ void EC_Consumer::connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL) + int shutdown_event_type) { this->supplier_proxy_ = consumer_admin->obtain_push_supplier (); - this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); + this->connect (qos, shutdown_event_type); } void EC_Consumer::connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL) + int shutdown_event_type) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; // @@ Throw? @@ -51,8 +49,7 @@ EC_Consumer::connect ( this->is_active_ = 1; this->supplier_proxy_->connect_push_consumer (this->myself_.in (), - qos - ACE_ENV_ARG_PARAMETER); + qos); } int @@ -83,8 +80,8 @@ EC_Consumer::shutdown (void) PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (id.in ()); this->myself_ = RtecEventComm::PushConsumer::_nil (); this->is_active_ = 0; } @@ -103,11 +100,10 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const } void -EC_Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) +EC_Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->consumer_push (this->cookie_, events ACE_ENV_ARG_PARAMETER); + this->driver_->consumer_push (this->cookie_, events); if (events.length () == 0) { @@ -143,7 +139,7 @@ EC_Consumer::push (const RtecEventComm::EventSet& events now - creation); if (e.header.type == this->shutdown_event_type_) - this->driver_->consumer_shutdown (this->cookie_ ACE_ENV_ARG_PARAMETER); + this->driver_->consumer_shutdown (this->cookie_); } } @@ -151,7 +147,7 @@ void EC_Consumer::disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->consumer_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER); + this->driver_->consumer_disconnect (this->cookie_); this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); } diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.h b/TAO/orbsvcs/tests/Event/lib/Consumer.h index cbab389f954..e7e0eb758de 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -46,8 +46,7 @@ public: virtual void connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL); + int shutdown_event_type); /** * The driver program can build the QoS attributes and we use @@ -56,8 +55,7 @@ public: */ virtual void connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL); + int shutdown_event_type); /// returns 0 if it is not connected virtual int connected (void) const; @@ -79,8 +77,7 @@ public: // = The RtecEventComm::PushConsumer methods /// The skeleton methods. - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp index cfa0c1c3b30..e3fa9afacbb 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp @@ -13,8 +13,7 @@ EC_Counting_Consumer::EC_Counting_Consumer (const char* name) void EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - const RtecEventChannelAdmin::ConsumerQOS &qos - ACE_ENV_ARG_DECL) + const RtecEventChannelAdmin::ConsumerQOS &qos) { // The canonical protocol to connect to the EC @@ -28,8 +27,7 @@ EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer } this->supplier_proxy_->connect_push_consumer (consumer.in (), - qos - ACE_ENV_ARG_PARAMETER); + qos); } void @@ -50,8 +48,8 @@ EC_Counting_Consumer::deactivate (void) PortableServer::POA_var consumer_poa = this->_default_POA (); PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this); + consumer_poa->deactivate_object (consumer_id.in ()); } @@ -76,8 +74,7 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance) } void -EC_Counting_Consumer::push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL_NOT_USED) +EC_Counting_Consumer::push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h index f61be75b8c5..5c63615d8f5 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h @@ -37,8 +37,7 @@ public: /// Simple connect/disconnect methods.. void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - const RtecEventChannelAdmin::ConsumerQOS &qos - ACE_ENV_ARG_DECL); + const RtecEventChannelAdmin::ConsumerQOS &qos); void disconnect (void); void deactivate (void); @@ -49,8 +48,7 @@ public: // = The RtecEventComm::PushConsumer methods /// The skeleton methods. - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 0d7c67a7469..4c7ac41f29c 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -19,8 +19,7 @@ EC_Counting_Supplier::EC_Counting_Supplier (void) void EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int milliseconds - ACE_ENV_ARG_DECL) + int milliseconds) { RtecEventComm::PushConsumer_var consumer = this->consumer_adapter_._this (); @@ -41,8 +40,7 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume 0); this->supplier_proxy_->connect_push_consumer (consumer.in (), - consumer_qos.get_ConsumerQOS () - ACE_ENV_ARG_PARAMETER); + consumer_qos.get_ConsumerQOS ()); } void @@ -53,8 +51,8 @@ EC_Counting_Supplier::deactivate (void) PortableServer::POA_var consumer_poa = this->consumer_adapter_._default_POA (); PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (&this->consumer_adapter_ ACE_ENV_ARG_PARAMETER); - consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (&this->consumer_adapter_); + consumer_poa->deactivate_object (consumer_id.in ()); } void @@ -63,8 +61,7 @@ EC_Counting_Supplier::connect ( int published_source, int published_type, int event_source, - int event_type - ACE_ENV_ARG_DECL) + int event_type) { this->event_source_ = event_source; this->event_type_ = event_type; @@ -74,15 +71,13 @@ EC_Counting_Supplier::connect ( published_type, 0, 1); this->connect (supplier_admin, - supplier_qos.get_SupplierQOS () - ACE_ENV_ARG_PARAMETER); + supplier_qos.get_SupplierQOS ()); } void EC_Counting_Supplier::connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - const RtecEventChannelAdmin::SupplierQOS &qos - ACE_ENV_ARG_DECL) + const RtecEventChannelAdmin::SupplierQOS &qos) { RtecEventComm::PushSupplier_var supplier = this->_this (); @@ -94,8 +89,7 @@ EC_Counting_Supplier::connect ( } this->consumer_proxy_->connect_push_supplier (supplier.in (), - qos - ACE_ENV_ARG_PARAMETER); + qos); } void @@ -109,16 +103,15 @@ EC_Counting_Supplier::disconnect (void) PortableServer::POA_var supplier_poa = this->_default_POA (); PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this); + supplier_poa->deactivate_object (supplier_id.in ()); this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); } void -EC_Counting_Supplier::push (const RtecEventComm::EventSet& - ACE_ENV_ARG_DECL) +EC_Counting_Supplier::push (const RtecEventComm::EventSet&) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) @@ -130,7 +123,7 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet& event[0].header.type = this->event_type_; event[0].header.ttl = 1; - this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (event); this->event_count++; } @@ -162,15 +155,14 @@ EC_Counting_Supplier_Task:: int EC_Counting_Supplier_Task::svc () { - ACE_TRY_NEW_ENV + try { this->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } @@ -194,7 +186,7 @@ EC_Counting_Supplier_Task::run (void) int stop = 0; do { - this->supplier_->push (this->event_ ACE_ENV_ARG_PARAMETER); + this->supplier_->push (this->event_); // Sleep for a short time to avoid spinning... ACE_OS::sleep (0); diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index 7a89f71d468..54702a32de9 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h @@ -45,8 +45,7 @@ public: * receives the timeout. */ void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int period - ACE_ENV_ARG_DECL); + int period); void deactivate (void); /// Simple connect/disconnect methods.. @@ -54,16 +53,13 @@ public: int published_source, int published_type, int event_source, - int event_type - ACE_ENV_ARG_DECL); + int event_type); void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - const RtecEventChannelAdmin::SupplierQOS &qos - ACE_ENV_ARG_DECL); + const RtecEventChannelAdmin::SupplierQOS &qos); void disconnect (void); /// The Consumer side methods. - void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index d83239d9f4d..624e05b0c3a 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -61,13 +61,13 @@ EC_Driver::~EC_Driver (void) int EC_Driver::run (int argc, char* argv[]) { - ACE_TRY_NEW_ENV + try { // Calibrate the high resolution timer *before* starting the // test. ACE_High_Res_Timer::calibrate (); - this->run_init (argc, argv ACE_ENV_ARG_PARAMETER); + this->run_init (argc, argv); this->execute_test (); @@ -75,27 +75,24 @@ EC_Driver::run (int argc, char* argv[]) this->run_cleanup (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "EC_Driver::run"); + ex._tao_print_exception ("EC_Driver::run"); } - ACE_CATCHALL + catch (...) { ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) non-corba exception raised\n")); } - ACE_ENDTRY; return 0; } void -EC_Driver::run_init (int &argc, char* argv[] - ACE_ENV_ARG_DECL) +EC_Driver::run_init (int &argc, char* argv[]) { - this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER); + this->initialize_orb_and_poa (argc, argv); if (this->parse_args (argc, argv)) - ACE_THROW (CORBA::INTERNAL (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO); if (this->verbose ()) this->print_args (); @@ -112,18 +109,15 @@ EC_Driver::run_init (int &argc, char* argv[] } if (this->move_to_rt_class () == -1) - ACE_THROW (CORBA::INTERNAL (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw CORBA::INTERNAL (TAO::VMCID, CORBA::COMPLETED_NO); this->initialize_ec_impl (); if (this->allocate_consumers () == -1) - ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO); if (this->allocate_suppliers () == -1) - ACE_THROW (CORBA::NO_MEMORY (TAO::VMCID, - CORBA::COMPLETED_NO)); + throw CORBA::NO_MEMORY (TAO::VMCID, CORBA::COMPLETED_NO); this->connect_clients (); } @@ -150,7 +144,7 @@ EC_Driver::run_cleanup (void) this->cleanup_consumers (); this->cleanup_ec (); - this->root_poa_->destroy (1, 1 ACE_ENV_ARG_PARAMETER); + this->root_poa_->destroy (1, 1); this->root_poa_ = PortableServer::POA::_nil (); this->orb_->destroy (); @@ -158,14 +152,13 @@ EC_Driver::run_cleanup (void) } void -EC_Driver::initialize_orb_and_poa (int &argc, char* argv[] - ACE_ENV_ARG_DECL) +EC_Driver::initialize_orb_and_poa (int &argc, char* argv[]) { this->orb_ = - CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, ""); CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA"); if (CORBA::is_nil (poa_object.in ())) { @@ -175,7 +168,7 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[] } this->root_poa_ = - PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in ()); PortableServer::POAManager_var poa_manager = this->root_poa_->the_POAManager (); @@ -280,24 +273,24 @@ EC_Driver::obtain_remote_ec (void) channel_name[0].id = CORBA::string_dup (this->event_service_name_); CORBA::Object_var tmp = - naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER); + naming_context->resolve (channel_name); this->event_channel_ = - RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (tmp.in ()); } CosNaming::NamingContext_ptr EC_Driver::get_naming_context (void) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("NameService"); if (CORBA::is_nil (naming_obj.in ())) ACE_ERROR ((LM_ERROR, "EC_Driver (%P|%t) Unable to obtain the " "Naming Service.\n")); - return CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); + return CosNaming::NamingContext::_narrow (naming_obj.in ()); } #endif @@ -332,8 +325,8 @@ EC_Driver::deactivate_ec (void) PortableServer::POA_var poa = this->ec_impl_->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this->ec_impl_); + poa->deactivate_object (id.in ()); } if (this->verbose ()) @@ -417,7 +410,7 @@ EC_Driver::connect_consumers (void) for (int i = 0; i < this->n_consumers_; ++i) { - this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER); + this->connect_consumer (consumer_admin.in (), i); } if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) connected consumer(s)\n")); @@ -426,25 +419,22 @@ EC_Driver::connect_consumers (void) void EC_Driver::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i - ACE_ENV_ARG_DECL) + int i) { RtecEventChannelAdmin::ConsumerQOS qos; int shutdown_event_type; - this->build_consumer_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); + this->build_consumer_qos (i, qos, shutdown_event_type); this->consumers_[i]->connect (consumer_admin, qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); } void EC_Driver::build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, - int& shutdown_event_type - ACE_ENV_ARG_DECL_NOT_USED) + int& shutdown_event_type) { RtecBase::handle_t rt_info = 0; @@ -472,7 +462,7 @@ EC_Driver::connect_suppliers (void) for (int i = 0; i < this->n_suppliers_; ++i) { - this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER); + this->connect_supplier (supplier_admin.in (), i); } if (this->verbose ()) @@ -482,25 +472,22 @@ EC_Driver::connect_suppliers (void) void EC_Driver::connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - int i - ACE_ENV_ARG_DECL) + int i) { RtecEventChannelAdmin::SupplierQOS qos; int shutdown_event_type; - this->build_supplier_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); + this->build_supplier_qos (i, qos, shutdown_event_type); this->suppliers_[i]->connect (supplier_admin, qos, - shutdown_event_type - ACE_ENV_ARG_PARAMETER); + shutdown_event_type); } void EC_Driver::build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, - int& shutdown_event_type - ACE_ENV_ARG_DECL_NOT_USED) + int& shutdown_event_type) { int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_; int supplier_id = i + 1; @@ -958,25 +945,21 @@ EC_Driver::decode_supplier_cookie (void* cookie) const void EC_Driver::consumer_push (void*, - const RtecEventComm::EventSet& - ACE_ENV_ARG_DECL_NOT_USED) + const RtecEventComm::EventSet&) { } void -EC_Driver::consumer_shutdown (void* - ACE_ENV_ARG_DECL_NOT_USED) +EC_Driver::consumer_shutdown (void*) { } void -EC_Driver::consumer_disconnect (void* - ACE_ENV_ARG_DECL_NOT_USED) +EC_Driver::consumer_disconnect (void*) { } void -EC_Driver::supplier_disconnect (void* - ACE_ENV_ARG_DECL_NOT_USED) +EC_Driver::supplier_disconnect (void*) { } diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index 31de1c799b1..0c2ec1a622c 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -64,15 +64,13 @@ public: virtual int run (int argc, char* argv[]); /// The initialization section - virtual void run_init (int& argc, char* argv[] - ACE_ENV_ARG_DECL); + virtual void run_init (int& argc, char* argv[]); /// The cleanup section virtual void run_cleanup (void); /// Initialize the ORB and obtain the RootPOA object - virtual void initialize_orb_and_poa (int& argc, char* argv[] - ACE_ENV_ARG_DECL); + virtual void initialize_orb_and_poa (int& argc, char* argv[]); /// Parse the common command-line arguments for all tests virtual int parse_args (int& argc, char* argv[]); @@ -109,15 +107,13 @@ public: /// Connect consumer number <i> using the consumer_admin provided. virtual void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, - int i - ACE_ENV_ARG_DECL); + int i); /// Build the QoS requirements for consumer <i> virtual void build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, - int& shutdown_event_type - ACE_ENV_ARG_DECL_NOT_USED); + int& shutdown_event_type); /// Connect all the suppliers, by default it lets each supplier /// connect itself. @@ -126,15 +122,13 @@ public: /// Connect supplier number <i> using the supplier_admin provided. virtual void connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, - int i - ACE_ENV_ARG_DECL); + int i); /// Build the QoS requirements for supplier <i> virtual void build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, - int& shutdown_event_type - ACE_ENV_ARG_DECL_NOT_USED); + int& shutdown_event_type); /// Execute the test, by default simply call activate_suppliers() virtual void execute_test (void); @@ -181,20 +175,16 @@ public: /// One of the consumers in the test has received an event virtual void consumer_push (void* consumer_cookie, - const RtecEventComm::EventSet& event - ACE_ENV_ARG_DECL); + const RtecEventComm::EventSet& event); /// One of the consumers has received a shutdown event - virtual void consumer_shutdown (void* consumer_cookie - ACE_ENV_ARG_DECL); + virtual void consumer_shutdown (void* consumer_cookie); /// One of the consumers in the test has been disconnected from the EC - virtual void consumer_disconnect (void* consumer_cookie - ACE_ENV_ARG_DECL); + virtual void consumer_disconnect (void* consumer_cookie); /// One of the suppliers in the test has been disconnected from the EC - virtual void supplier_disconnect (void* supplier_cookie - ACE_ENV_ARG_DECL); + virtual void supplier_disconnect (void* supplier_cookie); #if !defined(EC_DISABLE_REMOTE_EC) /// Obtain the EC from the Naming service diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index 1bbf0a96679..e1c135d0398 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -26,8 +26,7 @@ EC_Supplier::EC_Supplier (EC_Driver *driver, } void -EC_Supplier::send_event (int event_number - ACE_ENV_ARG_DECL) +EC_Supplier::send_event (int event_number) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -48,12 +47,11 @@ EC_Supplier::send_event (int event_number this->event_type (event_number, event[0]); - this->send_event (event ACE_ENV_ARG_PARAMETER); + this->send_event (event); } void -EC_Supplier::send_event (const RtecEventComm::EventSet& event - ACE_ENV_ARG_DECL) +EC_Supplier::send_event (const RtecEventComm::EventSet& event) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -72,7 +70,7 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (event); ACE_hrtime_t end = ACE_OS::gethrtime (); this->throughput_.sample (end - this->throughput_start_, @@ -108,19 +106,17 @@ EC_Supplier::event_type (int event_number, void EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL) + int shutdown_event_type) { this->consumer_proxy_ = supplier_admin->obtain_push_consumer (); - this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); + this->connect (qos, shutdown_event_type); } void EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL) + int shutdown_event_type) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; // @@ Throw? @@ -135,8 +131,7 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, this->is_active_ = 1; this->consumer_proxy_->connect_push_supplier (this->myself_.in (), - qos - ACE_ENV_ARG_PARAMETER); + qos); } void @@ -161,8 +156,8 @@ EC_Supplier::shutdown (void) PortableServer::POA_var poa = this->_default_POA (); PortableServer::ObjectId_var id = - poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); - poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); + poa->servant_to_id (this); + poa->deactivate_object (id.in ()); this->is_active_ = 0; this->myself_ = RtecEventComm::PushSupplier::_nil (); } @@ -171,7 +166,7 @@ void EC_Supplier::disconnect_push_supplier (void) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->supplier_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER); + this->driver_->supplier_disconnect (this->cookie_); this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); } @@ -215,7 +210,6 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier, int EC_Supplier_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; // Initialize a time value to pace the test ACE_Time_Value tv (0, this->burst_pause_); @@ -236,7 +230,7 @@ EC_Supplier_Task::svc (void) { for (int j = 0; j < this->burst_size_; ++j) { - ACE_TRY + try { this->supplier_->event_type (j, event[0]); @@ -245,41 +239,38 @@ EC_Supplier_Task::svc (void) now); // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); - this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER); + this->supplier_->send_event (event); } - ACE_CATCH (CORBA::SystemException, sys_ex) + catch (const CORBA::SystemException& sys_ex) { - ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX"); + sys_ex._tao_print_exception ("SYS_EX"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX"); + ex._tao_print_exception ("SYS_EX"); } - ACE_ENDTRY; } ACE_OS::sleep (tv); } - ACE_TRY_EX(SHUTDOWN) + try { // Send one event shutdown from each supplier event[0].header.type = this->shutdown_event_type_; ACE_hrtime_t now = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, now); - this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK_EX (SHUTDOWN); + this->supplier_->send_event (event); } - ACE_CATCH (CORBA::SystemException, sys_ex) + catch (const CORBA::SystemException& sys_ex) { - ACE_PRINT_EXCEPTION (sys_ex, "SYS_EX"); + sys_ex._tao_print_exception ("SYS_EX"); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "SYS_EX"); + ex._tao_print_exception ("SYS_EX"); } - ACE_ENDTRY; ACE_DEBUG ((LM_DEBUG, "Supplier task finished\n")); diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index 29fd4a3451f..a5bd9d2fb1e 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -52,12 +52,10 @@ public: /// The types of the event is chosen by the driver, based on the /// cookie and the <event_number> - void send_event (int event_number - ACE_ENV_ARG_DECL); + void send_event (int event_number); /// Send <event> to the EC. - void send_event (const RtecEventComm::EventSet& event - ACE_ENV_ARG_DECL); + void send_event (const RtecEventComm::EventSet& event); /// Set the event type and source in <event> void send_event (int event_number, @@ -71,14 +69,12 @@ public: virtual void connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL); + int shutdown_event_type); /// Connect using the current consumer_proxy (useful for reconnect test) virtual void connect ( const RtecEventChannelAdmin::SupplierQOS& qos, - int shutdown_event_type - ACE_ENV_ARG_DECL); + int shutdown_event_type); /// Disconnect from the EC, also deactivates the object void disconnect (void); |