diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event/Basic')
23 files changed, 276 insertions, 452 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; } |