diff options
Diffstat (limited to 'TAO/orbsvcs/tests/Event')
44 files changed, 817 insertions, 817 deletions
diff --git a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp index d3a33e84377..5130896ad70 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.cpp @@ -18,24 +18,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -46,11 +46,11 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -58,12 +58,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -76,7 +76,7 @@ main (int argc, char* argv[]) event_type, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier1.connect (supplier_admin.in (), @@ -84,7 +84,7 @@ main (int argc, char* argv[]) event_type + 1, event_source, event_type + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -108,7 +108,7 @@ main (int argc, char* argv[]) consumer01.connect (consumer_admin.in (), consumer_qos01.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Consumer consumer0 ("Consumer/0", event_type); @@ -117,7 +117,7 @@ main (int argc, char* argv[]) consumer0.connect (consumer_admin.in (), consumer_qos0.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Consumer consumer1 ("Consumer/1", event_type); @@ -126,7 +126,7 @@ main (int argc, char* argv[]) consumer1.connect (consumer_admin.in (), consumer_qos1.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -146,24 +146,24 @@ main (int argc, char* argv[]) ACE_Time_Value tv (0, 10000); consumer0.connect (consumer_admin.in (), consumer_qos0.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; consumer1.connect (consumer_admin.in (), consumer_qos1.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (i % 2 == 0) { consumer01.connect (consumer_admin.in (), consumer_qos0.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } else { consumer01.connect (consumer_admin.in (), consumer_qos01.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -180,28 +180,28 @@ main (int argc, char* argv[]) // Cleanup.. - consumer01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - supplier1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -291,7 +291,7 @@ Consumer::dump_results (int base_count, void Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 76f5ee25e49..e808ca3d26a 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Atomic_Reconnect.h @@ -45,7 +45,7 @@ public: // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); CORBA::ULong event_base_count; diff --git a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp index c5587bc8de6..ca521ef8056 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.cpp @@ -74,7 +74,7 @@ EC_BCast::modify_attributes (TAO_EC_Event_Channel_Attributes&) } void -EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL) +EC_BCast::execute_test (ACE_ENV_SINGLE_ARG_DECL) { TAO_ECG_UDP_Sender sender; TAO_ECG_UDP_Out_Endpoint endpoint; @@ -83,7 +83,7 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL) Simple_Address_Server address_server_impl (udp_addr); RtecUDPAdmin::AddrServer_var address_server = - address_server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + address_server_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (endpoint.dgram ().open (ACE_Addr::sap_any) == -1) @@ -95,15 +95,15 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL) sender.init (this->event_channel_.in (), address_server.in (), &endpoint - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS sub; int shutdown_event_type; - this->build_consumer_qos (0, sub, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->build_consumer_qos (0, sub, shutdown_event_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; - sender.open (sub TAO_ENV_ARG_PARAMETER); + sender.open (sub ACE_ENV_ARG_PARAMETER); ACE_CHECK; TAO_ECG_UDP_Receiver receiver; @@ -116,7 +116,7 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL) address_server.in (), this->orb_->orb_core ()->reactor (), expire, 5 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; udp_eh.reactor (this->orb_->orb_core ()->reactor ()); @@ -127,16 +127,16 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL) } RtecEventChannelAdmin::SupplierQOS pub; - this->build_supplier_qos (0, pub, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->build_supplier_qos (0, pub, shutdown_event_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; - receiver.open (pub TAO_ENV_ARG_PARAMETER); + receiver.open (pub ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->allocate_tasks () == -1) return; - this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -159,10 +159,10 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "BCast (%P|%t) suppliers finished\n")); - receiver.close (TAO_ENV_SINGLE_ARG_PARAMETER); + receiver.close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - sender.close (TAO_ENV_SINGLE_ARG_PARAMETER); + sender.close (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // @@ Deactivate all the objects...! @@ -170,12 +170,12 @@ EC_BCast::execute_test (TAO_ENV_SINGLE_ARG_DECL) { // Deactivate the Address Server PortableServer::POA_var poa = - address_server_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + address_server_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&address_server_impl TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&address_server_impl ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -201,7 +201,7 @@ Simple_Address_Server (const ACE_INET_Addr& address) void Simple_Address_Server::get_addr (const RtecEventComm::EventHeader&, RtecUDPAdmin::UDP_Addr& address - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) 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 91151483da1..85e4f32437d 100644 --- a/TAO/orbsvcs/tests/Event/Basic/BCast.h +++ b/TAO/orbsvcs/tests/Event/Basic/BCast.h @@ -45,7 +45,7 @@ public: virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // set the bcastion flags - void execute_test (TAO_ENV_SINGLE_ARG_DECL); + void execute_test (ACE_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. void dump_results (void); @@ -71,7 +71,7 @@ public: virtual void get_addr (const RtecEventComm::EventHeader& header, RtecUDPAdmin::UDP_Addr& address - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 6486aa05c1c..c34c27eea06 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Bitmask.cpp @@ -15,24 +15,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -43,11 +43,11 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -55,12 +55,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -71,28 +71,28 @@ main (int argc, char* argv[]) first_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; first_supplier.connect (supplier_admin.in (), 0x00001111UL, 0x11110000UL, 0x00001111UL, 0x11110000UL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; EC_Counting_Supplier second_supplier; second_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; second_supplier.connect (supplier_admin.in (), 0x01100000UL, 0x00000110UL, 0x01100000UL, 0x00000110UL - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -109,7 +109,7 @@ main (int argc, char* argv[]) consumer_bitmask_reject.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -126,7 +126,7 @@ main (int argc, char* argv[]) consumer_bitmask_accept.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -143,7 +143,7 @@ main (int argc, char* argv[]) consumer_bitmask_filter.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -161,7 +161,7 @@ main (int argc, char* argv[]) consumer_bitmask_value.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -179,7 +179,7 @@ main (int argc, char* argv[]) consumer_bitmask_loose.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -192,36 +192,36 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_bitmask_loose.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_bitmask_loose.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_bitmask_value.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_bitmask_value.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_bitmask_filter.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_bitmask_filter.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_bitmask_accept.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_bitmask_accept.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_bitmask_reject.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_bitmask_reject.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - second_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - second_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -239,7 +239,7 @@ main (int argc, char* argv[]) expected = second_supplier.event_count; consumer_bitmask_loose.dump_results (expected, 5); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp index af1af27c30f..05ed9b5f448 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Complex.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Complex.cpp @@ -14,24 +14,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -40,11 +40,11 @@ main (int argc, char* argv[]) poa.in ()); TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -52,12 +52,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -70,14 +70,14 @@ main (int argc, char* argv[]) supplier_00.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_00.connect (supplier_admin.in (), event_source, event_type, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -86,14 +86,14 @@ main (int argc, char* argv[]) supplier_01.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_01.connect (supplier_admin.in (), event_source, event_type + 1, event_source, event_type + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -102,14 +102,14 @@ main (int argc, char* argv[]) supplier_10.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_10.connect (supplier_admin.in (), event_source + 1, event_type, event_source + 1, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -118,14 +118,14 @@ main (int argc, char* argv[]) supplier_11.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_11.connect (supplier_admin.in (), event_source + 1, event_type + 1, event_source + 1, event_type + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -144,7 +144,7 @@ main (int argc, char* argv[]) consumer_00.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -164,7 +164,7 @@ main (int argc, char* argv[]) consumer_01.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -177,41 +177,41 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_11.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_11.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_10.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_10.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_01.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_00.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_11.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_11.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_10.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_10.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.cpp b/TAO/orbsvcs/tests/Event/Basic/Control.cpp index af0ed3d1bde..b84226a540c 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Control.cpp @@ -18,24 +18,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -46,11 +46,11 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -58,12 +58,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -75,7 +75,7 @@ main (int argc, char* argv[]) event_type, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -90,7 +90,7 @@ main (int argc, char* argv[]) consumer0.connect (consumer_admin.in (), consumer_qos0.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Consumer consumer1 ("Consumer/1", 200); @@ -99,7 +99,7 @@ main (int argc, char* argv[]) consumer1.connect (consumer_admin.in (), consumer_qos0.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -124,24 +124,24 @@ main (int argc, char* argv[]) // The consumers should be disconnected already, but make sure // that they did... - //consumer1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + //consumer1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); //ACE_TRY_CHECK; - //consumer0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + //consumer0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); //ACE_TRY_CHECK; // **************************************************************** - supplier0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -174,7 +174,7 @@ Consumer::Consumer (const char* name, void Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -192,7 +192,7 @@ Consumer::push (const RtecEventComm::EventSet& events return; } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/tests/Event/Basic/Control.h b/TAO/orbsvcs/tests/Event/Basic/Control.h index 9f467e6c711..7ad7d9772f5 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Control.h +++ b/TAO/orbsvcs/tests/Event/Basic/Control.h @@ -39,7 +39,7 @@ public: // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) 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 c2b2605dd4d..124ffcb5e2e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Disconnect.cpp @@ -12,47 +12,47 @@ ACE_RCSID(EC_Tests, Disconnect, "$Id$") static void run_test (PortableServer::POA_ptr poa, int use_callbacks - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER); + run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER); + run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -69,44 +69,44 @@ main (int argc, char* argv[]) void deactivate_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void run_test (PortableServer::POA_ptr poa, int use_callbacks - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Event_Channel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = use_callbacks; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // and the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** @@ -134,55 +134,55 @@ run_test (PortableServer::POA_ptr poa, { supplier_0.connect (supplier_admin.in (), supplier_qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; consumer_0.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { supplier_1.connect (supplier_admin.in (), supplier_qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; consumer_1.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { - consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } supplier_0.connect (supplier_admin.in (), supplier_qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; consumer_0.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER); + deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER); + deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER); + deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count_0 = 1; diff --git a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp index b02ef2f8546..527d1c124e2 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Gateway.cpp @@ -15,24 +15,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -43,45 +43,45 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl_1 (attributes); - ec_impl_1.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl_1.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel_1 = - ec_impl_1._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl_1._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** TAO_EC_Event_Channel ec_impl_2 (attributes); - ec_impl_2.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl_2.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel_2 = - ec_impl_2._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl_2._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_1 = - event_channel_1->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel_1->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_1 = - event_channel_1->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel_1->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin_2 = - event_channel_2->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel_2->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin_2 = - event_channel_2->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel_2->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -89,14 +89,14 @@ main (int argc, char* argv[]) TAO_EC_Gateway_IIOP gateway; gateway.init (event_channel_1.in (), event_channel_2.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); RtecEventChannelAdmin::Observer_var obs = - gateway._this (TAO_ENV_SINGLE_ARG_PARAMETER); + gateway._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::Observer_Handle h = - event_channel_2->append_observer (obs.in () TAO_ENV_ARG_PARAMETER); + event_channel_2->append_observer (obs.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; gateway.observer_handle (h); @@ -111,28 +111,28 @@ main (int argc, char* argv[]) supplier_00.activate (consumer_admin_1.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_00.connect (supplier_admin_1.in (), event_source, event_type, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; EC_Counting_Supplier supplier_01; supplier_01.activate (consumer_admin_1.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier_01.connect (supplier_admin_1.in (), event_source, event_type + 1, event_source, event_type + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -149,7 +149,7 @@ main (int argc, char* argv[]) consumer_00.connect (consumer_admin_2.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -180,7 +180,7 @@ main (int argc, char* argv[]) consumer_00.connect (consumer_admin_2.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -207,7 +207,7 @@ main (int argc, char* argv[]) consumer_00.connect (consumer_admin_2.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -226,7 +226,7 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -238,7 +238,7 @@ main (int argc, char* argv[]) consumer_00.connect (consumer_admin_2.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -269,7 +269,7 @@ main (int argc, char* argv[]) consumer_00.connect (consumer_admin_2.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -296,7 +296,7 @@ main (int argc, char* argv[]) consumer_00.connect (consumer_admin_2.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -315,36 +315,36 @@ main (int argc, char* argv[]) // **************************************************************** - consumer_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_01.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_00.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_01.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_01.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_00.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_00.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - gateway.shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + gateway.shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel_1->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel_1->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - event_channel_2->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel_2->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp index 104c76200c7..28b60cf41bf 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.cpp @@ -13,47 +13,47 @@ ACE_RCSID(EC_Tests, MT_Disconnect, "$Id$") static void run_test (PortableServer::POA_ptr poa, int use_callbacks - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); int main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - run_test (poa.in (), 0 TAO_ENV_ARG_PARAMETER); + run_test (poa.in (), 0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - run_test (poa.in (), 1 TAO_ENV_ARG_PARAMETER); + run_test (poa.in (), 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -70,32 +70,32 @@ main (int argc, char* argv[]) void deactivate_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void run_test (PortableServer::POA_ptr poa, int use_callbacks - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Event_Channel_Attributes attributes (poa, poa); attributes.disconnect_callbacks = use_callbacks; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; Task task (event_channel.in (), use_callbacks); @@ -108,10 +108,10 @@ run_test (PortableServer::POA_ptr poa, // Wait for all the threads to complete and the return ACE_Thread_Manager::instance ()->wait (); - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&ec_impl TAO_ENV_ARG_PARAMETER); + deactivate_servant (&ec_impl ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -130,7 +130,7 @@ Task::svc () { ACE_TRY_NEW_ENV { - this->run_iteration (TAO_ENV_SINGLE_ARG_PARAMETER); + this->run_iteration (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -143,16 +143,16 @@ Task::svc () } void -Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL) +Task::run_iteration (ACE_ENV_SINGLE_ARG_DECL) { // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // and the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // **************************************************************** @@ -180,40 +180,40 @@ Task::run_iteration (TAO_ENV_SINGLE_ARG_DECL) { supplier_0.connect (supplier_admin.in (), supplier_qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; consumer_0.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { supplier_1.connect (supplier_admin.in (), supplier_qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; consumer_1.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } - supplier_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - consumer_0.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_0.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (i % 2 == 1) { - consumer_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - supplier_1.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_1.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } - deactivate_servant (&supplier_0 TAO_ENV_ARG_PARAMETER); + deactivate_servant (&supplier_0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; - deactivate_servant (&consumer_0 TAO_ENV_ARG_PARAMETER); + deactivate_servant (&consumer_0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::ULong count_0 = 0; diff --git a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h index 68cb65381d6..4448774b248 100644 --- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h @@ -34,7 +34,7 @@ public: // = Check the ACE_Task_Base documentation. int svc (void); - void run_iteration (TAO_ENV_SINGLE_ARG_DECL); + void run_iteration (ACE_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp index e8775059df6..e94876eff99 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Negation.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Negation.cpp @@ -15,24 +15,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -43,11 +43,11 @@ main (int argc, char* argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -55,12 +55,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -73,42 +73,42 @@ main (int argc, char* argv[]) first_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; first_supplier.connect (supplier_admin.in (), event_source, event_type, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; EC_Counting_Supplier second_supplier; second_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; second_supplier.connect (supplier_admin.in (), event_source, event_type + 1, event_source, event_type + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; EC_Counting_Supplier third_supplier; third_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; third_supplier.connect (supplier_admin.in (), event_source, event_type + 1, event_source, event_type + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -125,7 +125,7 @@ main (int argc, char* argv[]) regular_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -143,7 +143,7 @@ main (int argc, char* argv[]) negation_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -156,37 +156,37 @@ main (int argc, char* argv[]) // **************************************************************** - negation_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + negation_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - third_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + third_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - third_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + third_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - second_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + second_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - second_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + second_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + first_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - first_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + first_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -199,7 +199,7 @@ main (int argc, char* argv[]) first_supplier.event_count; regular_consumer.dump_results (expected, 5); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp index b8b90e089fd..8ea3d55d74b 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.cpp @@ -48,7 +48,7 @@ EC_Master::run (int argc, char* argv[]) this->seed_ = ACE_OS::time (0); - this->initialize_orb_and_poa (argc, argv TAO_ENV_ARG_PARAMETER); + this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (this->parse_args (argc, argv)) @@ -84,7 +84,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 TAO_ENV_ARG_PARAMETER); + this->channels_[i]->run_init (targc, targv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } delete[] targv; @@ -93,7 +93,7 @@ EC_Master::run (int argc, char* argv[]) { for (int i = 0; i != this->n_channels_; ++i) { - this->channels_[i]->execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channels_[i]->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -115,7 +115,7 @@ EC_Master::run (int argc, char* argv[]) { for (int i = 0; i != this->n_channels_; ++i) { - this->channels_[i]->run_cleanup (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channels_[i]->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } } @@ -123,13 +123,13 @@ EC_Master::run (int argc, char* argv[]) { for (int i = 0; i != this->n_channels_; ++i) { - this->channels_[i]->disconnect_clients (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channels_[i]->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->channels_[i]->shutdown_clients (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channels_[i]->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->channels_[i]->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channels_[i]->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->channels_[i]->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->channels_[i]->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->channels_[i]->cleanup_tasks (); this->channels_[i]->cleanup_suppliers (); @@ -140,10 +140,10 @@ EC_Master::run (int argc, char* argv[]) this->root_poa_->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -160,14 +160,14 @@ EC_Master::run (int argc, char* argv[]) void EC_Master::initialize_orb_and_poa (int &argc, char* argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -178,14 +178,14 @@ EC_Master::initialize_orb_and_poa (int &argc, char* argv[] } this->root_poa_ = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -250,7 +250,7 @@ EC_Observer::~EC_Observer (void) void EC_Observer::initialize_orb_and_poa (int&, char*[] - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } @@ -273,7 +273,7 @@ EC_Observer::print_usage (void) } void -EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL) +EC_Observer::execute_test (ACE_ENV_SINGLE_ARG_DECL) { int peer_count = this->master_->channel_count (); ACE_NEW (this->gwys_, TAO_EC_Gateway_IIOP[peer_count]); @@ -288,14 +288,14 @@ EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL) this->gwys_[i].init (rmt_ec, this->event_channel_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); RtecEventChannelAdmin::Observer_var obs = - this->gwys_[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->gwys_[i]._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_Handle h = - rmt_ec->append_observer (obs.in () TAO_ENV_ARG_PARAMETER); + rmt_ec->append_observer (obs.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->gwys_[i].observer_handle (h); @@ -306,7 +306,7 @@ EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL) if (this->allocate_tasks () == -1) return; - this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -315,7 +315,7 @@ EC_Observer::execute_test (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Observer::run_cleanup (TAO_ENV_SINGLE_ARG_DECL) +EC_Observer::run_cleanup (ACE_ENV_SINGLE_ARG_DECL) { for (int j = 0; j != this->master_->channel_count (); ++j) { @@ -325,10 +325,10 @@ EC_Observer::run_cleanup (TAO_ENV_SINGLE_ARG_DECL) RtecEventChannelAdmin::EventChannel_ptr rmt_ec = this->master_->channel (j)->event_channel_.in (); rmt_ec->remove_observer (this->gwys_[j].observer_handle () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; - this->gwys_[j].shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->gwys_[j].shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } } @@ -363,24 +363,24 @@ void EC_Observer::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (i == 0) { this->EC_Driver::connect_consumer (consumer_admin, i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); return; } unsigned int x = ACE_OS::rand_r (this->seed_); if (x < RAND_MAX / 8) this->EC_Driver::connect_consumer (consumer_admin, i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void EC_Observer::consumer_push (void*, const RtecEventComm::EventSet& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { unsigned int x = ACE_OS::rand_r (this->seed_); if (x < (RAND_MAX / 64)) @@ -390,7 +390,7 @@ EC_Observer::consumer_push (void*, "EC_Observer[%d] (%P|%t) reconnecting\n", this->id_)); RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (int i = 1; i < this->n_consumers_; ++i) @@ -399,13 +399,13 @@ EC_Observer::consumer_push (void*, if (this->consumers_[i]->connected ()) { - this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } else { this->EC_Driver::connect_consumer (consumer_admin.in (), - i TAO_ENV_ARG_PARAMETER); + i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } diff --git a/TAO/orbsvcs/tests/Event/Basic/Observer.h b/TAO/orbsvcs/tests/Event/Basic/Observer.h index 655ad3e9111..7c562cfab60 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Observer.h +++ b/TAO/orbsvcs/tests/Event/Basic/Observer.h @@ -44,7 +44,7 @@ public: // Execute the test. virtual void initialize_orb_and_poa (int& argc, char* argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Obtain the orb and the poa pointers int channel_count (void) const; @@ -90,24 +90,24 @@ public: // = The EC_Driver methods virtual void initialize_orb_and_poa (int& argc, char* argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual int parse_args (int& argc, char* argv[]); virtual void print_args (void) const; virtual void print_usage (void); // add some command line args to enable/disable observerions - void execute_test (TAO_ENV_SINGLE_ARG_DECL); - void run_cleanup (TAO_ENV_SINGLE_ARG_DECL); + void execute_test (ACE_ENV_SINGLE_ARG_DECL); + void run_cleanup (ACE_ENV_SINGLE_ARG_DECL); // Run the suppliers, using the <thread_manager> parameter void dump_results (void); void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void consumer_push (void*, const RtecEventComm::EventSet& - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); private: EC_Master *master_; diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.cpp b/TAO/orbsvcs/tests/Event/Basic/Random.cpp index 5b9b6cbcf73..967f69b7edd 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Random.cpp @@ -22,15 +22,15 @@ const int base_type = 20; void deactivate_servant (PortableServer::Servant servant - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { PortableServer::POA_var poa = - servant->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + servant->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var oid = - poa->servant_to_id (servant TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (servant ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (oid.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -49,11 +49,11 @@ RND_Driver::RND_Driver (void) int RND_Driver::run (int argc, char *argv[]) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -116,15 +116,15 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -135,23 +135,23 @@ RND_Driver::run (int argc, char *argv[]) attributes.supplier_reconnect = 1; TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** // Obtain the consumer admin.. this->consumer_admin_ = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. this->supplier_admin_ = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -173,7 +173,7 @@ RND_Driver::run (int argc, char *argv[]) this->timer_.connect (this->consumer_admin_.in (), qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -185,7 +185,7 @@ RND_Driver::run (int argc, char *argv[]) this->supplier_.connect (this->supplier_admin_.in (), qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -201,7 +201,7 @@ RND_Driver::run (int argc, char *argv[]) 1); CORBA::Object_var obj = - this->consumers_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[i]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -218,7 +218,7 @@ RND_Driver::run (int argc, char *argv[]) this->suppliers_[j]->activate (); CORBA::Object_var obj = - this->suppliers_[j]->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[j]->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -235,9 +235,9 @@ RND_Driver::run (int argc, char *argv[]) for (int k = 0; k != this->nsuppliers_; ++k) { deactivate_servant (this->suppliers_[k] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->suppliers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } delete[] this->suppliers_; @@ -248,7 +248,7 @@ RND_Driver::run (int argc, char *argv[]) // We destroy now to verify that the callbacks work and do not // produce any problems. - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -257,9 +257,9 @@ RND_Driver::run (int argc, char *argv[]) for (int k = 0; k != this->nconsumers_; ++k) { deactivate_servant (this->consumers_[k] - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->consumers_[k]->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[k]->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } delete[] this->consumers_; @@ -269,17 +269,17 @@ RND_Driver::run (int argc, char *argv[]) // **************************************************************** deactivate_servant (&ec_impl - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -293,7 +293,7 @@ RND_Driver::run (int argc, char *argv[]) void RND_Driver::timer (const RtecEventComm::Event &e - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { int r = ACE_OS::rand (); if (r < 0) @@ -313,7 +313,7 @@ RND_Driver::timer (const RtecEventComm::Event &e event.length (1); event[0] = e; event[0].header.source ++; - this->supplier_.push (event TAO_ENV_ARG_PARAMETER); + this->supplier_.push (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -338,7 +338,7 @@ RND_Driver::timer (const RtecEventComm::Event &e this->suppliers_[n]->connect (this->supplier_admin_.in (), qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } break; @@ -355,7 +355,7 @@ RND_Driver::timer (const RtecEventComm::Event &e this->consumers_[n]->connect (this->consumer_admin_.in (), qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } break; @@ -366,7 +366,7 @@ RND_Driver::timer (const RtecEventComm::Event &e // ACE_DEBUG ((LM_DEBUG, "Disconnecting supplier %d\n", n)); - this->suppliers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } break; @@ -377,7 +377,7 @@ RND_Driver::timer (const RtecEventComm::Event &e // ACE_DEBUG ((LM_DEBUG, "Disconnecting consumer %d\n", n)); - this->consumers_[n]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[n]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } break; @@ -386,21 +386,21 @@ RND_Driver::timer (const RtecEventComm::Event &e void RND_Driver::event (const RtecEventComm::Event &e - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->timer (e TAO_ENV_ARG_PARAMETER); + this->timer (e ACE_ENV_ARG_PARAMETER); } // **************************************************************** void RND_Timer::push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->driver_->timer (event[0] TAO_ENV_ARG_PARAMETER); + this->driver_->timer (event[0] ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -414,7 +414,7 @@ RND_Timer::push (const RtecEventComm::EventSet &event void RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -422,29 +422,29 @@ RND_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, if (CORBA::is_nil (this->proxy_.in ())) { - this->proxy_ = admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_ = admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } proxy = RtecEventChannelAdmin::ProxyPushSupplier::_duplicate(this->proxy_.in ()); } RtecEventComm::PushConsumer_var me = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; proxy->connect_push_consumer (me.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +RND_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; - this->proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); @@ -452,14 +452,14 @@ RND_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) void RND_Consumer::push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->event (event[0] TAO_ENV_ARG_PARAMETER); + this->driver_->event (event[0] ACE_ENV_ARG_PARAMETER); } void -RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +RND_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -469,7 +469,7 @@ RND_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, const RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -477,7 +477,7 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, if (CORBA::is_nil (this->proxy_.in ())) { - this->proxy_ = admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_ = admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -485,41 +485,41 @@ RND_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ()); } RtecEventComm::PushSupplier_var me = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; proxy->connect_push_supplier (me.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -RND_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +RND_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); if (CORBA::is_nil (this->proxy_.in ())) return; - this->proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); } void -RND_Supplier::push_new_event (TAO_ENV_SINGLE_ARG_DECL) +RND_Supplier::push_new_event (ACE_ENV_SINGLE_ARG_DECL) { RtecEventComm::EventSet event (1); event.length (1); event[0].header.type = base_type; event[0].header.source = 0; - this->push (event TAO_ENV_ARG_PARAMETER); + this->push (event ACE_ENV_ARG_PARAMETER); } void RND_Supplier::push (RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -532,11 +532,11 @@ RND_Supplier::push (RtecEventComm::EventSet &event RtecEventChannelAdmin::ProxyPushConsumer::_duplicate(this->proxy_.in ()); } - proxy->push (event TAO_ENV_ARG_PARAMETER); + proxy->push (event ACE_ENV_ARG_PARAMETER); } void -RND_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +RND_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -549,13 +549,13 @@ RND_Supplier::svc (void) int niterations = 5000; for (int i = 0; i != niterations; ++i) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { ACE_Time_Value tv (0, 10000); ACE_OS::sleep (tv); - this->push_new_event (TAO_ENV_SINGLE_ARG_PARAMETER); + this->push_new_event (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/tests/Event/Basic/Random.h b/TAO/orbsvcs/tests/Event/Basic/Random.h index 3ef3e1f0bb9..fbbb5ee8468 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Random.h +++ b/TAO/orbsvcs/tests/Event/Basic/Random.h @@ -48,15 +48,15 @@ public: // Constructor void push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) + void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr admin, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL); - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); protected: RND_Driver *driver_; @@ -83,7 +83,7 @@ public: RND_Timer (RND_Driver *driver); void push (const RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); }; @@ -111,15 +111,15 @@ public: void connect (RtecEventChannelAdmin::SupplierAdmin_ptr admin, const RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL); - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); - void push_new_event (TAO_ENV_SINGLE_ARG_DECL); + void push_new_event (ACE_ENV_SINGLE_ARG_DECL); void push (RtecEventComm::EventSet &event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Push a single event... - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); virtual int svc (void); @@ -153,11 +153,11 @@ public: // Run the test void timer (const RtecEventComm::Event &e - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The main timer has expired void event (const RtecEventComm::Event &e - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the consumers has received an event private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp index 4b8879820ec..8e80572c29e 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.cpp @@ -88,18 +88,18 @@ EC_Reconnect::modify_attributes (TAO_EC_Event_Channel_Attributes& attr) } void -EC_Reconnect::execute_test (TAO_ENV_SINGLE_ARG_DECL) +EC_Reconnect::execute_test (ACE_ENV_SINGLE_ARG_DECL) { - this->execute_consumer_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->execute_consumer_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->execute_supplier_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->execute_supplier_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor (); this->consumer_reconnect_.dump_results ("Reconnect/consumer", gsf); this->supplier_reconnect_.dump_results ("Reconnect/supplier", gsf); - // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); + // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -108,11 +108,11 @@ EC_Reconnect::dump_results (void) } void -EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL) +EC_Reconnect::execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ConsumerQOS qos; int shutdown_event_type; - this->build_consumer_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->build_consumer_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->allow_consumer_reconnect_) @@ -123,7 +123,7 @@ EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL) ACE_hrtime_t start = ACE_OS::gethrtime (); this->consumers_[0]->connect (qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->consumer_reconnect_.sample (stop - start_time, @@ -136,7 +136,7 @@ EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL) { this->consumers_[0]->connect (qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_ERROR, "Expected exception\n")); @@ -153,19 +153,19 @@ EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ENDTRY; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[0]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumers_[0]->connect (consumer_admin.in (), qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->consumer_reconnect_.sample (stop - start_time, @@ -175,11 +175,11 @@ EC_Reconnect::execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL) +EC_Reconnect::execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::SupplierQOS qos; int shutdown_event_type; - this->build_supplier_qos (0, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->build_supplier_qos (0, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->allow_supplier_reconnect_) @@ -189,7 +189,7 @@ EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->suppliers_[0]->connect (qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->supplier_reconnect_.sample (stop - start_time, @@ -201,7 +201,7 @@ EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { this->suppliers_[0]->connect (qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_ERROR, "Expected exception\n")); @@ -218,19 +218,19 @@ EC_Reconnect::execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL) ACE_ENDTRY; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->disconnections_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[0]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[0]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->suppliers_[0]->connect (supplier_admin.in (), qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t stop = ACE_OS::gethrtime (); this->supplier_reconnect_.sample (stop - start_time, diff --git a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h index 34f32a5388d..5430aebd876 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h +++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h @@ -54,14 +54,14 @@ public: virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // set the reconnection flags - void execute_test (TAO_ENV_SINGLE_ARG_DECL); + void execute_test (ACE_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. void dump_results (void); // Don't dump the EC_Driver results, they are meaningless. - void execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - void execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void execute_consumer_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + void execute_supplier_test (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // Separate the suppliers and consumers. private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp index 3b51c048d04..63ca69d88b1 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.cpp @@ -49,13 +49,13 @@ EC_Schedule::print_usage (void) } void -EC_Schedule::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL) +EC_Schedule::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL) { this->scheduler_impl_ = new ACE_Config_Scheduler; - this->scheduler_ = this->scheduler_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->scheduler_ = this->scheduler_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER); + this->EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -72,7 +72,7 @@ EC_Schedule::cleanup_ec (void) } void -EC_Schedule::execute_test (TAO_ENV_SINGLE_ARG_DECL) +EC_Schedule::execute_test (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Long min_priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -91,7 +91,7 @@ EC_Schedule::execute_test (TAO_ENV_SINGLE_ARG_DECL) infos.out (), configs.out (), anomalies.out () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -113,13 +113,13 @@ EC_Schedule::build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, int& shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { char name[128]; ACE_OS::sprintf (name, "EC_Schedule::Consumer::%04x", i); RtecScheduler::handle_t rt_info = - this->scheduler_->create (name TAO_ENV_ARG_PARAMETER); + this->scheduler_->create (name ACE_ENV_ARG_PARAMETER); ACE_CHECK; // The worst case execution time is far less than 2 @@ -135,7 +135,7 @@ EC_Schedule::build_consumer_qos ( time, 0, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; int type_start = @@ -159,13 +159,13 @@ EC_Schedule::build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, int& shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { char name[128]; ACE_OS::sprintf (name, "EC_Schedule::Supplier::%04x", i); RtecScheduler::handle_t rt_info = - this->scheduler_->create (name TAO_ENV_ARG_PARAMETER); + this->scheduler_->create (name ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Time_Value tv (0, this->burst_pause_); @@ -186,7 +186,7 @@ EC_Schedule::build_supplier_qos ( time, 1, RtecScheduler::OPERATION - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_; diff --git a/TAO/orbsvcs/tests/Event/Basic/Schedule.h b/TAO/orbsvcs/tests/Event/Basic/Schedule.h index 54a448f532c..4cb08296b1f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Schedule.h +++ b/TAO/orbsvcs/tests/Event/Basic/Schedule.h @@ -59,12 +59,12 @@ public: // add some command line args to change the scheduling service to // use. - void initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL); + void initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL); void cleanup_ec (void); virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // Set the scheduling service attribute - void execute_test (TAO_ENV_SINGLE_ARG_DECL); + void execute_test (ACE_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just compute the schedule. void dump_results (void); @@ -74,12 +74,12 @@ public: int i, RtecEventChannelAdmin::ConsumerQOS& qos, int& shutdown_event_type - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); virtual void build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, int& shutdown_event_type - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // This time really connect to the scheduler private: diff --git a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp index 2dfa9322b2c..35b530df511 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.cpp @@ -22,18 +22,18 @@ EC_Shutdown::EC_Shutdown (void) } void -EC_Shutdown::execute_test (TAO_ENV_SINGLE_ARG_DECL) +EC_Shutdown::execute_test (ACE_ENV_SINGLE_ARG_DECL) { if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) destroying EC\n")); - this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec destroyed\n")); - this->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -44,16 +44,16 @@ EC_Shutdown::execute_test (TAO_ENV_SINGLE_ARG_DECL) if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) ec cleanup\n")); - this->initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER); + this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Shutdown (%P|%t) status reset\n")); - // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); + // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER); } void @@ -72,7 +72,7 @@ EC_Shutdown::dump_results (void) void EC_Shutdown::consumer_disconnect (void* cookie - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { this->consumer_disconnects_++; if (this->verbose ()) @@ -81,7 +81,7 @@ EC_Shutdown::consumer_disconnect (void* cookie void EC_Shutdown::supplier_disconnect (void* cookie - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { 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 b97deb5536a..f0d9af6c43f 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Shutdown.h +++ b/TAO/orbsvcs/tests/Event/Basic/Shutdown.h @@ -39,18 +39,18 @@ public: // Constructor // = The EC_Driver methods - void execute_test (TAO_ENV_SINGLE_ARG_DECL); + void execute_test (ACE_ENV_SINGLE_ARG_DECL); // Don't run the suppliers just create the EC and then destroy it. void dump_results (void); // Don't dump the EC_Driver results, they are meaningless. virtual void consumer_disconnect (void* consumer_cookie - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the consumers in the test has been disconnected from the EC virtual void supplier_disconnect (void* supplier_cookie - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the suppliers in the test has been disconnected from the EC diff --git a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp index 8d2ff984a88..50363e86a26 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Timeout.cpp @@ -17,24 +17,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -43,11 +43,11 @@ main (int argc, char* argv[]) poa.in ()); TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -55,12 +55,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -68,12 +68,12 @@ main (int argc, char* argv[]) EC_Counting_Supplier supplier; supplier.activate (consumer_admin.in (), - 50 TAO_ENV_ARG_PARAMETER); + 50 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier.connect (supplier_admin.in (), 0, 20, 0, 20 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -100,7 +100,7 @@ main (int argc, char* argv[]) interval_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -127,7 +127,7 @@ main (int argc, char* argv[]) conjunction_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -150,7 +150,7 @@ main (int argc, char* argv[]) deadline_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -163,28 +163,28 @@ main (int argc, char* argv[]) // **************************************************************** - deadline_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + deadline_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - conjunction_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + conjunction_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - interval_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + interval_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp index 6a2569745fb..30690628e96 100644 --- a/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp +++ b/TAO/orbsvcs/tests/Event/Basic/Wildcard.cpp @@ -14,24 +14,24 @@ main (int argc, char* argv[]) { TAO_EC_Default_Factory::init_svcs (); - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { // ORB initialization boiler plate... CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var object = - orb->resolve_initial_references ("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references ("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var poa = - PortableServer::POA::_narrow (object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -40,11 +40,11 @@ main (int argc, char* argv[]) poa.in ()); TAO_EC_Event_Channel ec_impl (attributes); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var event_channel = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; @@ -52,12 +52,12 @@ main (int argc, char* argv[]) // Obtain the consumer admin.. RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - event_channel->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Obtain the supplier admin.. RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - event_channel->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -70,14 +70,14 @@ main (int argc, char* argv[]) supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; supplier.connect (supplier_admin.in (), event_source, event_type, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -86,14 +86,14 @@ main (int argc, char* argv[]) other_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; other_supplier.connect (supplier_admin.in (), event_source + 1, event_type + 1, event_source + 1, event_type + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -102,14 +102,14 @@ main (int argc, char* argv[]) any_source_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; any_source_supplier.connect (supplier_admin.in (), 0, event_type, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -118,14 +118,14 @@ main (int argc, char* argv[]) any_type_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; any_type_supplier.connect (supplier_admin.in (), event_source, 0, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -134,14 +134,14 @@ main (int argc, char* argv[]) wildcard_supplier.activate (consumer_admin.in (), milliseconds - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; wildcard_supplier.connect (supplier_admin.in (), 0, 0, event_source, event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** @@ -158,7 +158,7 @@ main (int argc, char* argv[]) regular_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -176,7 +176,7 @@ main (int argc, char* argv[]) any_type_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -194,7 +194,7 @@ main (int argc, char* argv[]) any_source_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -212,7 +212,7 @@ main (int argc, char* argv[]) wildcard_consumer.connect (consumer_admin.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -225,52 +225,52 @@ main (int argc, char* argv[]) // **************************************************************** - wildcard_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + wildcard_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + any_source_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_type_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + any_type_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - regular_consumer.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + regular_consumer.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - wildcard_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + wildcard_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - wildcard_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + wildcard_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_type_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + any_type_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + any_source_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - any_source_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + any_source_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - other_supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + other_supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - other_supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + other_supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier.deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier.disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier.disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - event_channel->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + event_channel->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** - poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + poa->destroy (1, 1 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // **************************************************************** diff --git a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp index a9f009ecf92..bc3dc16a191 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.cpp @@ -24,9 +24,9 @@ EC_Connect::EC_Connect (void) } void -EC_Connect::execute_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +EC_Connect::execute_test (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { - // this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); + // this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER); } int @@ -109,12 +109,12 @@ void EC_Connect::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Driver::connect_consumer (consumer_admin, i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_hrtime_t now = ACE_OS::gethrtime (); this->consumer_connect_.sample (now - this->start_time_, now - start); @@ -124,12 +124,12 @@ void EC_Connect::connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Driver::connect_supplier (supplier_admin, i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_hrtime_t now = ACE_OS::gethrtime (); this->supplier_connect_.sample (now - this->start_time_, now - start); @@ -148,23 +148,23 @@ EC_Connect::allocate_supplier (int i) } void -EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL) +EC_Connect::connect_clients (ACE_ENV_SINGLE_ARG_DECL) { this->start_time_ = ACE_OS::gethrtime (); switch (this->order_) { default: case 0: - this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; case 1: - this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -177,23 +177,23 @@ EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL) max = this->n_suppliers_; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (int i = 0; i != max; ++i) { if (i < this->n_consumers_) { - this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER); + this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } if (i < this->n_suppliers_) { - this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER); + this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -201,22 +201,22 @@ EC_Connect::connect_clients (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL) +EC_Connect::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL) { switch (this->order_) { default: case 0: - this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; case 1: - this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; @@ -229,11 +229,11 @@ EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL) max = this->n_suppliers_; RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t start_time = ACE_OS::gethrtime (); @@ -243,7 +243,7 @@ EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -254,7 +254,7 @@ EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -268,14 +268,14 @@ EC_Connect::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Connect::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) +EC_Connect::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) { ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->n_consumers_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -290,14 +290,14 @@ EC_Connect::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Connect::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) +EC_Connect::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) { ACE_hrtime_t start_time = ACE_OS::gethrtime (); for (int i = 0; i < this->n_suppliers_; ++i) { ACE_hrtime_t start = ACE_OS::gethrtime (); - this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -324,24 +324,24 @@ ECC_Consumer::connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->EC_Consumer::connect (consumer_admin, qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void ECC_Consumer::connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Consumer::connect (qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_hrtime_t now = ACE_OS::gethrtime (); this->connect_time_.sample (now, now - start); } @@ -366,24 +366,24 @@ ECC_Supplier::connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->EC_Supplier::connect (supplier_admin, qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void ECC_Supplier::connect ( const RtecEventChannelAdmin::SupplierQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_hrtime_t start = ACE_OS::gethrtime (); this->EC_Supplier::connect (qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); 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 5d09185b9ae..caaf08b425a 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Connect.h +++ b/TAO/orbsvcs/tests/Event/Performance/Connect.h @@ -51,7 +51,7 @@ public: virtual void print_usage (void); virtual void print_args (void) const; - void execute_test (TAO_ENV_SINGLE_ARG_DECL); + void execute_test (ACE_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. virtual void dump_results (void); @@ -59,19 +59,19 @@ public: virtual void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, int i - TAO_ENV_ARG_DECL); - virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); - virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + virtual void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL); + virtual void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL); virtual EC_Consumer* allocate_consumer (int i); virtual EC_Supplier* allocate_supplier (int i); - virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); - virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void connect_clients (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void disconnect_clients (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); private: ACE_hrtime_t start_time_; @@ -95,11 +95,11 @@ public: RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void dump_results (const char* name, ACE_UINT32 global_scale_factor); @@ -118,11 +118,11 @@ public: RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); virtual void connect ( const RtecEventChannelAdmin::SupplierQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); 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 8d01cace479..cb09add9977 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.cpp @@ -54,10 +54,10 @@ EC_Inversion::parse_args (int &argc, char *argv []) } void -EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL) +EC_Inversion::connect_consumers (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_ConsumerQOS_Factory qos0; @@ -68,7 +68,7 @@ EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL) this->consumers_[0]->connect (consumer_admin.in (), qos0.get_ConsumerQOS (), ACE_ES_EVENT_UNDEFINED + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); for (int i = 1; i < this->n_consumers_; ++i) { @@ -84,17 +84,17 @@ EC_Inversion::connect_consumers (TAO_ENV_SINGLE_ARG_DECL) this->consumers_[i]->connect (consumer_admin.in (), qos1.get_ConsumerQOS (), base_event + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Inversion (%P|%t) connected consumer(s)\n")); } void -EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL) +EC_Inversion::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; ACE_SupplierQOS_Factory qos0; @@ -104,7 +104,7 @@ EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL) this->suppliers_[0]->connect (supplier_admin.in (), qos0.get_SupplierQOS (), ACE_ES_EVENT_UNDEFINED + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); for (int j = 1; j != this->n_suppliers_; ++j) { @@ -119,7 +119,7 @@ EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL) this->suppliers_[j]->connect (supplier_admin.in (), qos1.get_SupplierQOS (), base_event + 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } if (this->verbose ()) @@ -127,7 +127,7 @@ EC_Inversion::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Inversion::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +EC_Inversion::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { int priority; diff --git a/TAO/orbsvcs/tests/Event/Performance/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h index 4f9bc592bfc..6811eb6c794 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h +++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h @@ -41,14 +41,14 @@ public: // The options controlling the event types are ignored, and only two // consumers are created. - virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); - virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void connect_consumers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); + virtual void connect_suppliers (ACE_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS); // In this test there are two consumers, the high priority consumer // receives only events from a single high priority supplier. The // other consumer receives events from a set of low priority // suppliers. - virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED); + virtual void activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED); // Activate the suppliers at different priorities private: diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp index 6debc2655ba..8ab0220c0d8 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.cpp @@ -49,18 +49,18 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Object_var manager_object = orb->resolve_initial_references ("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (manager_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -71,11 +71,11 @@ main (int argc, char *argv []) policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_scope - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_DEBUG ((LM_DEBUG, @@ -84,7 +84,7 @@ main (int argc, char *argv []) #endif /* TAO_HAS_MESSAGING */ CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -93,14 +93,14 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -108,12 +108,12 @@ main (int argc, char *argv []) // Get the event channel object reference CORBA::Object_var object = - orb->string_to_object (ec_ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ec_ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = RtecEventChannelAdmin::EventChannel::_narrow (object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -135,15 +135,15 @@ main (int argc, char *argv []) // Connect the consumer RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushSupplier_var proxy_supplier = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushConsumer_var consumer_reference = - consumer._this (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Simple subscription, but usually the helper classes in @@ -162,7 +162,7 @@ main (int argc, char *argv []) proxy_supplier->connect_push_consumer (consumer_reference.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected consumer\n")); @@ -172,15 +172,15 @@ main (int argc, char *argv []) // The canonical protocol to connect to the EC RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::ProxyPushConsumer_var proxy_consumer = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventComm::PushSupplier_var supplier_reference = - supplier._this (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Simple publication, but usually the helper classes in @@ -194,7 +194,7 @@ main (int argc, char *argv []) proxy_consumer->connect_push_supplier (supplier_reference.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected supplier\n")); @@ -207,7 +207,7 @@ main (int argc, char *argv []) while (!task.done () || !consumer.done ()) { ACE_Time_Value tv (1, 0); - orb->run (tv TAO_ENV_ARG_PARAMETER); + orb->run (tv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -238,24 +238,24 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Throughtput: %f\n", throughput)); - proxy_supplier->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy_supplier->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - proxy_consumer->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy_consumer->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id; - id = root_poa->servant_to_id (&consumer TAO_ENV_ARG_PARAMETER); + id = root_poa->servant_to_id (&consumer ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - id = root_poa->servant_to_id (&supplier TAO_ENV_ARG_PARAMETER); - root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + id = root_poa->servant_to_id (&supplier ACE_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, ex) @@ -323,7 +323,7 @@ EC_Latency_Consumer::done (void) void EC_Latency_Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t creation; @@ -343,7 +343,7 @@ EC_Latency_Consumer::push (const RtecEventComm::EventSet& events } void -EC_Latency_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +EC_Latency_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -355,7 +355,7 @@ EC_Latency_Supplier::EC_Latency_Supplier (void) } void -EC_Latency_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +EC_Latency_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } @@ -393,7 +393,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 TAO_ENV_ARG_PARAMETER); + this->consumer_->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // ACE_Time_Value tv (0, 5000); diff --git a/TAO/orbsvcs/tests/Event/Performance/Latency.h b/TAO/orbsvcs/tests/Event/Performance/Latency.h index 4d9b2287736..3b6880e36b5 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency.h +++ b/TAO/orbsvcs/tests/Event/Performance/Latency.h @@ -40,9 +40,9 @@ public: int done (void); virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: @@ -64,7 +64,7 @@ public: /// Constructor EC_Latency_Supplier (void); - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) 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 30b38cfe38a..d9b322e648e 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Latency_Server.cpp @@ -48,18 +48,18 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #if (TAO_HAS_CORBA_MESSAGING == 1) CORBA::Object_var manager_object = orb->resolve_initial_references ("ORBPolicyManager" - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = CORBA::PolicyManager::_narrow (manager_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -70,11 +70,11 @@ main (int argc, char *argv []) policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, sync_scope - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, CORBA::SET_OVERRIDE - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; #else ACE_DEBUG ((LM_DEBUG, @@ -83,7 +83,7 @@ main (int argc, char *argv []) #endif /* TAO_HAS_MESSAGING */ CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + orb->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -92,14 +92,14 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + root_poa->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -108,15 +108,15 @@ main (int argc, char *argv []) TAO_EC_Event_Channel_Attributes attr (root_poa.in (), root_poa.in ()); TAO_EC_Event_Channel ec_impl (attr); - ec_impl.activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl.activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - ec_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var str = - orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (ior_file_name != 0) @@ -131,15 +131,15 @@ main (int argc, char *argv []) ACE_OS::fclose (output_file); } - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::ObjectId_var id = - root_poa->servant_to_id (&ec_impl TAO_ENV_ARG_PARAMETER); - root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + root_poa->servant_to_id (&ec_impl ACE_ENV_ARG_PARAMETER); + root_poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCH (CORBA::Exception, ex) diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp index 5955b95febc..1ebbb09a649 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp @@ -47,9 +47,9 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&) } void -EC_Throughput::execute_test (TAO_ENV_SINGLE_ARG_DECL) +EC_Throughput::execute_test (ACE_ENV_SINGLE_ARG_DECL) { - this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_PARAMETER); } void diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h index 8d8b222b3b2..f3d5ee6cc04 100644 --- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h +++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h @@ -44,7 +44,7 @@ public: virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr); // set the throughpution flags - void execute_test (TAO_ENV_SINGLE_ARG_DECL); + void execute_test (ACE_ENV_SINGLE_ARG_DECL); // Don't run the suppliers, just test connect and disconnect calls. void dump_results (void); diff --git a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp index c8fdfc9a2f5..ed9c16e3de3 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.cpp @@ -23,20 +23,20 @@ EC_Consumer::connect ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); } void EC_Consumer::connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; // @@ Throw? @@ -45,14 +45,14 @@ EC_Consumer::connect ( if (CORBA::is_nil (this->myself_.in ())) { - this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->is_active_ = 1; this->supplier_proxy_->connect_push_consumer (this->myself_.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -63,12 +63,12 @@ EC_Consumer::connected (void) const } void -EC_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +EC_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->supplier_proxy_.in ())) return; - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = @@ -76,19 +76,19 @@ EC_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Consumer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +EC_Consumer::shutdown (ACE_ENV_SINGLE_ARG_DECL) { if (!this->is_active_) return; // Deactivate the servant PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->myself_ = RtecEventComm::PushConsumer::_nil (); this->is_active_ = 0; @@ -109,10 +109,10 @@ EC_Consumer::accumulate (ACE_Throughput_Stats& throughput) const void EC_Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->consumer_push (this->cookie_, events TAO_ENV_ARG_PARAMETER); + this->driver_->consumer_push (this->cookie_, events ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (events.length () == 0) @@ -149,16 +149,16 @@ EC_Consumer::push (const RtecEventComm::EventSet& events now - creation); if (e.header.type == this->shutdown_event_type_) - this->driver_->consumer_shutdown (this->cookie_ TAO_ENV_ARG_PARAMETER); + this->driver_->consumer_shutdown (this->cookie_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } void -EC_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL) +EC_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->consumer_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER); + this->driver_->consumer_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; 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 8aaaed1d37f..9bb507daf0f 100644 --- a/TAO/orbsvcs/tests/Event/lib/Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Consumer.h @@ -48,14 +48,14 @@ public: RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The driver program can build the QoS attributes and obtain the // ConsumerAdmin, we do the rest. virtual void connect ( const RtecEventChannelAdmin::ConsumerQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The driver program can build the QoS attributes and we use // whatevet supplier_proxy we already have (useful for reconnection // tests). @@ -63,11 +63,11 @@ public: virtual int connected (void) const; // returns 0 if it is not connected - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // The application can invoke this method to disconnect from the EC // and deactivate this class. - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); // The application is shutting down, deactivate the consumer. void accumulate (ACE_Throughput_Stats& throughput) const; @@ -80,9 +80,9 @@ public: // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp index cfb93e722cf..27d761b753a 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.cpp @@ -14,50 +14,50 @@ EC_Counting_Consumer::EC_Counting_Consumer (const char* name) void EC_Counting_Consumer::connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { // The canonical protocol to connect to the EC RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->supplier_proxy_.in ())) { this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->supplier_proxy_->connect_push_consumer (consumer.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -EC_Counting_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +EC_Counting_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->supplier_proxy_.in ())) { - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = RtecEventChannelAdmin::ProxyPushSupplier::_nil (); } - this->deactivate (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate (ACE_ENV_SINGLE_ARG_PARAMETER); } void -EC_Counting_Consumer::deactivate (TAO_ENV_SINGLE_ARG_DECL) +EC_Counting_Consumer::deactivate (ACE_ENV_SINGLE_ARG_DECL) { PortableServer::POA_var consumer_poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); + consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -84,7 +84,7 @@ EC_Counting_Consumer::dump_results (int expected_count, int tolerance) void EC_Counting_Consumer::push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { if (events.length () == 0) @@ -107,7 +107,7 @@ EC_Counting_Consumer::push (const RtecEventComm::EventSet& events } void -EC_Counting_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +EC_Counting_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h index 1a87e648171..83de36443e9 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Consumer.h @@ -40,9 +40,9 @@ public: void connect (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, const RtecEventChannelAdmin::ConsumerQOS &qos - TAO_ENV_ARG_DECL); - void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void deactivate (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); + void deactivate (ACE_ENV_SINGLE_ARG_DECL); // Simple connect/disconnect methods.. void dump_results (int expected_count, int tolerance); @@ -52,9 +52,9 @@ public: // = The RtecEventComm::PushConsumer methods virtual void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp index 696cf024273..0c9d83d8fcb 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.cpp @@ -17,14 +17,14 @@ EC_Counting_Supplier::EC_Counting_Supplier (void) void EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int milliseconds - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::PushConsumer_var consumer = - this->consumer_adapter_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_adapter_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->supplier_proxy_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // Let's say that the execution time for event 2 is 1 @@ -41,23 +41,23 @@ EC_Counting_Supplier::activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consume this->supplier_proxy_->connect_push_consumer (consumer.in (), consumer_qos.get_ConsumerQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -EC_Counting_Supplier::deactivate (TAO_ENV_SINGLE_ARG_DECL) +EC_Counting_Supplier::deactivate (ACE_ENV_SINGLE_ARG_DECL) { - this->supplier_proxy_->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_proxy_->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::POA_var consumer_poa = - this->consumer_adapter_._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_adapter_._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var consumer_id = - consumer_poa->servant_to_id (&this->consumer_adapter_ TAO_ENV_ARG_PARAMETER); + consumer_poa->servant_to_id (&this->consumer_adapter_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - consumer_poa->deactivate_object (consumer_id.in () TAO_ENV_ARG_PARAMETER); + consumer_poa->deactivate_object (consumer_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -68,7 +68,7 @@ EC_Counting_Supplier::connect ( int published_type, int event_source, int event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->event_source_ = event_source; this->event_type_ = event_type; @@ -79,48 +79,48 @@ EC_Counting_Supplier::connect ( 0, 1); this->connect (supplier_admin, supplier_qos.get_SupplierQOS () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void EC_Counting_Supplier::connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (this->consumer_proxy_.in ())) { this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->consumer_proxy_->connect_push_supplier (supplier.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -EC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +EC_Counting_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (!CORBA::is_nil (this->consumer_proxy_.in ())) { - this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } PortableServer::POA_var supplier_poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var supplier_id = - supplier_poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + supplier_poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - supplier_poa->deactivate_object (supplier_id.in () TAO_ENV_ARG_PARAMETER); + supplier_poa->deactivate_object (supplier_id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -129,7 +129,7 @@ EC_Counting_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) void EC_Counting_Supplier::push (const RtecEventComm::EventSet& - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { if (CORBA::is_nil (this->consumer_proxy_.in ())) @@ -141,19 +141,19 @@ EC_Counting_Supplier::push (const RtecEventComm::EventSet& event[0].header.type = this->event_type_; event[0].header.ttl = 1; - this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->event_count++; } void -EC_Counting_Supplier::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +EC_Counting_Supplier::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { } void -EC_Counting_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +EC_Counting_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { this->disconnect_count++; @@ -176,7 +176,7 @@ EC_Counting_Supplier_Task::svc () { ACE_TRY_NEW_ENV { - this->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -201,13 +201,13 @@ EC_Counting_Supplier_Task::push_count (void) } void -EC_Counting_Supplier_Task::run (TAO_ENV_SINGLE_ARG_DECL) +EC_Counting_Supplier_Task::run (ACE_ENV_SINGLE_ARG_DECL) { this->event_.length (1); int stop = 0; do { - this->supplier_->push (this->event_ TAO_ENV_ARG_PARAMETER); + this->supplier_->push (this->event_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; // Sleep for a short time to avoid spinning... diff --git a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h index 813994c5fc0..16dcdf22acf 100644 --- a/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Counting_Supplier.h @@ -43,8 +43,8 @@ public: void activate (RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int period - TAO_ENV_ARG_DECL); - void deactivate (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void deactivate (ACE_ENV_SINGLE_ARG_DECL); // Connect as a consumer to receive a TIMEOUT every <period> // milliseconds. // The class pushes an event (in its supplier role) every time it @@ -55,21 +55,21 @@ public: int published_type, int event_source, int event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); void connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS &qos - TAO_ENV_ARG_DECL); - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + ACE_ENV_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Simple connect/disconnect methods.. void push (const RtecEventComm::EventSet& events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - void disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + void disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The Consumer side methods. - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); // The skeleton methods. @@ -108,7 +108,7 @@ public: void stop (void); CORBA::ULong push_count (void); - void run (TAO_ENV_SINGLE_ARG_DECL); + void run (ACE_ENV_SINGLE_ARG_DECL); // Run a single iteration of the test private: diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.cpp b/TAO/orbsvcs/tests/Event/lib/Driver.cpp index ee0fcaab316..ec5d7342741 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Driver.cpp @@ -67,15 +67,15 @@ EC_Driver::run (int argc, char* argv[]) // test. ACE_High_Res_Timer::calibrate (); - this->run_init (argc, argv TAO_ENV_ARG_PARAMETER); + this->run_init (argc, argv ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - this->execute_test (TAO_ENV_SINGLE_ARG_PARAMETER); + this->execute_test (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; this->dump_results (); - this->run_cleanup (TAO_ENV_SINGLE_ARG_PARAMETER); + this->run_cleanup (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY @@ -92,9 +92,9 @@ EC_Driver::run (int argc, char* argv[]) void EC_Driver::run_init (int &argc, char* argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { - this->initialize_orb_and_poa (argc, argv TAO_ENV_ARG_PARAMETER); + this->initialize_orb_and_poa (argc, argv ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->parse_args (argc, argv)) @@ -119,7 +119,7 @@ EC_Driver::run_init (int &argc, char* argv[] ACE_THROW (CORBA::INTERNAL (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); - this->initialize_ec_impl (TAO_ENV_SINGLE_ARG_PARAMETER); + this->initialize_ec_impl (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->allocate_consumers () == -1) @@ -130,26 +130,26 @@ EC_Driver::run_init (int &argc, char* argv[] ACE_THROW (CORBA::NO_MEMORY (TAO_DEFAULT_MINOR_CODE, CORBA::COMPLETED_NO)); - this->connect_clients (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_clients (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::run_cleanup (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::run_cleanup (ACE_ENV_SINGLE_ARG_DECL) { - this->disconnect_clients (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_clients (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->shutdown_clients (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_clients (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->destroy_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->destroy_ec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) channel destroyed\n")); - this->deactivate_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->deactivate_ec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -160,25 +160,25 @@ EC_Driver::run_cleanup (TAO_ENV_SINGLE_ARG_DECL) this->cleanup_consumers (); this->cleanup_ec (); - this->root_poa_->destroy (0, 0 TAO_ENV_ARG_PARAMETER); + this->root_poa_->destroy (0, 0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->root_poa_ = PortableServer::POA::_nil (); - this->orb_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->orb_ = CORBA::ORB::_nil (); } void EC_Driver::initialize_orb_and_poa (int &argc, char* argv[] - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->orb_ = - CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); + CORBA::ORB_init (argc, argv, "" ACE_ENV_ARG_PARAMETER); ACE_CHECK; CORBA::Object_var poa_object = - this->orb_->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references("RootPOA" ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -189,14 +189,14 @@ EC_Driver::initialize_orb_and_poa (int &argc, char* argv[] } this->root_poa_ = - PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); + PortableServer::POA::_narrow (poa_object.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; PortableServer::POAManager_var poa_manager = - this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); + this->root_poa_->the_POAManager (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -272,12 +272,12 @@ EC_Driver::move_to_rt_class (void) } void -EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL) { #if !defined(EC_DISABLE_REMOTE_EC) if (this->use_remote_ec_ == 1) { - this->obtain_remote_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->obtain_remote_ec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; } @@ -286,21 +286,21 @@ EC_Driver::initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL) #if !defined(EC_DISABLE_OLD_EC) if (this->use_old_ec_ == 1) { - this->initialize_old_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->initialize_old_ec (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; return; } #endif - this->initialize_new_ec (TAO_ENV_SINGLE_ARG_PARAMETER); + this->initialize_new_ec (ACE_ENV_SINGLE_ARG_PARAMETER); } #if !defined(EC_DISABLE_REMOTE_EC) void -EC_Driver::obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::NamingContext_var naming_context = - this->get_naming_context (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_naming_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CosNaming::Name channel_name (1); @@ -308,19 +308,19 @@ EC_Driver::obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL) channel_name[0].id = CORBA::string_dup (this->event_service_name_); CORBA::Object_var tmp = - naming_context->resolve (channel_name TAO_ENV_ARG_PARAMETER); + naming_context->resolve (channel_name ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->event_channel_ = - RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () TAO_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (tmp.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } CosNaming::NamingContext_ptr -EC_Driver::get_naming_context (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::get_naming_context (ACE_ENV_SINGLE_ARG_DECL) { CORBA::Object_var naming_obj = - this->orb_->resolve_initial_references ("NameService" TAO_ENV_ARG_PARAMETER); + this->orb_->resolve_initial_references ("NameService" ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (CosNaming::NamingContext::_nil ()); if (CORBA::is_nil (naming_obj.in ())) @@ -328,16 +328,16 @@ EC_Driver::get_naming_context (TAO_ENV_SINGLE_ARG_DECL) "EC_Driver (%P|%t) Unable to obtain the " "Naming Service.\n")); - return CosNaming::NamingContext::_narrow (naming_obj.in () TAO_ENV_ARG_PARAMETER); + return CosNaming::NamingContext::_narrow (naming_obj.in () ACE_ENV_ARG_PARAMETER); } #endif #if !defined(EC_DISABLE_OLD_EC) int -EC_Driver::initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::initialize_old_ec (ACE_ENV_SINGLE_ARG_DECL) { CosNaming::NamingContext_var naming_context = - this->get_naming_context (TAO_ENV_SINGLE_ARG_PARAMETER); + this->get_naming_context (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; // This is the name we (potentially) register the Scheduling @@ -358,11 +358,11 @@ EC_Driver::initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL) this->scheduler_ = - this->scheduler_impl_._this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->scheduler_impl_._this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; CORBA::String_var str = - this->orb_->object_to_string (scheduler.in () TAO_ENV_ARG_PARAMETER); + this->orb_->object_to_string (scheduler.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_DEBUG ((LM_DEBUG, "EC_Driver (%P|%t) The (local) scheduler IOR is <%s>\n", @@ -385,13 +385,13 @@ EC_Driver::initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL) -1); this->event_channel_ = - this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (-1); } #endif /* */ void -EC_Driver::initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL) { TAO_EC_Event_Channel_Attributes attr (this->root_poa_.in (), this->root_poa_.in ()); @@ -401,16 +401,16 @@ EC_Driver::initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL) new TAO_EC_Event_Channel (attr); this->ec_impl_ = ec; - ec->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_channel_ = - this->ec_impl_->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::deactivate_ec (ACE_ENV_SINGLE_ARG_DECL) { #if !defined(EC_DISABLE_REMOTE_EC) if (this->use_remote_ec_ == 1) @@ -420,12 +420,12 @@ EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL) { // Deactivate the EC PortableServer::POA_var poa = - this->ec_impl_->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ec_impl_->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this->ec_impl_ TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this->ec_impl_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -437,12 +437,12 @@ EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL) { // Deactivate the Scheduler PortableServer::POA_var poa = - scheduler_impl._default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + scheduler_impl._default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (&scheduler_impl TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (&scheduler_impl ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -452,9 +452,9 @@ EC_Driver::deactivate_ec (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Driver::destroy_ec (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::destroy_ec (ACE_ENV_SINGLE_ARG_DECL) { - this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -497,45 +497,45 @@ EC_Driver::allocate_supplier (int i) } void -EC_Driver::connect_clients (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::connect_clients (ACE_ENV_SINGLE_ARG_DECL) { - this->connect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->connect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::disconnect_clients (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::disconnect_clients (ACE_ENV_SINGLE_ARG_DECL) { - this->disconnect_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->disconnect_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->disconnect_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::shutdown_clients (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::shutdown_clients (ACE_ENV_SINGLE_ARG_DECL) { - this->shutdown_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->shutdown_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->shutdown_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } void -EC_Driver::connect_consumers (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::connect_consumers (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - this->event_channel_->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (int i = 0; i < this->n_consumers_; ++i) { - this->connect_consumer (consumer_admin.in (), i TAO_ENV_ARG_PARAMETER); + this->connect_consumer (consumer_admin.in (), i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -546,17 +546,17 @@ void EC_Driver::connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerQOS qos; int shutdown_event_type; - this->build_consumer_qos (i, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->build_consumer_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->consumers_[i]->connect (consumer_admin, qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void @@ -564,7 +564,7 @@ EC_Driver::build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, int& shutdown_event_type - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { RtecBase::handle_t rt_info = 0; @@ -585,15 +585,15 @@ EC_Driver::build_consumer_qos ( } void -EC_Driver::connect_suppliers (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::connect_suppliers (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - this->event_channel_->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (int i = 0; i < this->n_suppliers_; ++i) { - this->connect_supplier (supplier_admin.in (), i TAO_ENV_ARG_PARAMETER); + this->connect_supplier (supplier_admin.in (), i ACE_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -605,17 +605,17 @@ void EC_Driver::connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, int i - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierQOS qos; int shutdown_event_type; - this->build_supplier_qos (i, qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->build_supplier_qos (i, qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->suppliers_[i]->connect (supplier_admin, qos, shutdown_event_type - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); } void @@ -623,7 +623,7 @@ EC_Driver::build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, int& shutdown_event_type - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { int type_start = this->supplier_type_start_ + i*this->supplier_type_shift_; int supplier_id = i + 1; @@ -645,12 +645,12 @@ EC_Driver::build_supplier_qos ( } void -EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::execute_test (ACE_ENV_SINGLE_ARG_DECL) { if (this->allocate_tasks () == -1) return; - this->activate_tasks (TAO_ENV_SINGLE_ARG_PARAMETER); + this->activate_tasks (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; if (this->verbose ()) @@ -697,7 +697,7 @@ EC_Driver::allocate_task (int i) } void -EC_Driver::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +EC_Driver::activate_tasks (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) { int priority = (ACE_Sched_Params::priority_min (ACE_SCHED_FIFO) @@ -723,13 +723,13 @@ EC_Driver::activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) } void -EC_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL) { if (this->suppliers_ == 0) return; for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -737,13 +737,13 @@ EC_Driver::disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL) { if (this->consumers_ == 0) return; for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -751,13 +751,13 @@ EC_Driver::disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Driver::shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL) { if (this->suppliers_ == 0) return; for (int i = 0; i < this->n_suppliers_; ++i) { - this->suppliers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->suppliers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -765,13 +765,13 @@ EC_Driver::shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Driver::shutdown_consumers (TAO_ENV_SINGLE_ARG_DECL) +EC_Driver::shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL) { if (this->consumers_ == 0) return; for (int i = 0; i < this->n_consumers_; ++i) { - this->consumers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } if (this->verbose ()) @@ -1123,24 +1123,24 @@ EC_Driver::decode_supplier_cookie (void* cookie) const void EC_Driver::consumer_push (void*, const RtecEventComm::EventSet& - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void EC_Driver::consumer_shutdown (void* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void EC_Driver::consumer_disconnect (void* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } void EC_Driver::supplier_disconnect (void* - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) { } diff --git a/TAO/orbsvcs/tests/Event/lib/Driver.h b/TAO/orbsvcs/tests/Event/lib/Driver.h index 3f94e1f799f..3daa0aa56ce 100644 --- a/TAO/orbsvcs/tests/Event/lib/Driver.h +++ b/TAO/orbsvcs/tests/Event/lib/Driver.h @@ -65,14 +65,14 @@ public: // Execute the test. virtual void run_init (int& argc, char* argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The initialization section - virtual void run_cleanup (TAO_ENV_SINGLE_ARG_DECL); + virtual void run_cleanup (ACE_ENV_SINGLE_ARG_DECL); // The cleanup section virtual void initialize_orb_and_poa (int& argc, char* argv[] - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Initialize the ORB and obtain the RootPOA object virtual int parse_args (int& argc, char* argv[]); @@ -87,57 +87,57 @@ public: virtual int move_to_rt_class (void); // Run the test in the real-time class, return -1 on error. - virtual void initialize_ec_impl (TAO_ENV_SINGLE_ARG_DECL); + virtual void initialize_ec_impl (ACE_ENV_SINGLE_ARG_DECL); // Construct the EC and its helper objects, also activates the EC in // the RootPOA. - virtual void connect_clients (TAO_ENV_SINGLE_ARG_DECL); + virtual void connect_clients (ACE_ENV_SINGLE_ARG_DECL); // By default connect the consumers and then the suppliers, other // orders should work too. - virtual void disconnect_clients (TAO_ENV_SINGLE_ARG_DECL); + virtual void disconnect_clients (ACE_ENV_SINGLE_ARG_DECL); // By default disconnect the suppliers and then the consumers, other // orders should work too. - virtual void shutdown_clients (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown_clients (ACE_ENV_SINGLE_ARG_DECL); // By default deactivate the suppliers and then the consumers, other // orders should work too. - virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL); + virtual void connect_consumers (ACE_ENV_SINGLE_ARG_DECL); // Connect all the consumers, by default it lets each consumer // connect itself. virtual void connect_consumer ( RtecEventChannelAdmin::ConsumerAdmin_ptr consumer_admin, int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect consumer number <i> using the consumer_admin provided. virtual void build_consumer_qos ( int i, RtecEventChannelAdmin::ConsumerQOS& qos, int& shutdown_event_type - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Build the QoS requirements for consumer <i> - virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL); + virtual void connect_suppliers (ACE_ENV_SINGLE_ARG_DECL); // Connect all the suppliers, by default it lets each supplier // connect itself. virtual void connect_supplier ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, int i - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect supplier number <i> using the supplier_admin provided. virtual void build_supplier_qos ( int i, RtecEventChannelAdmin::SupplierQOS& qos, int& shutdown_event_type - TAO_ENV_ARG_DECL_NOT_USED); + ACE_ENV_ARG_DECL_NOT_USED); // Build the QoS requirements for supplier <i> - virtual void execute_test (TAO_ENV_SINGLE_ARG_DECL); + virtual void execute_test (ACE_ENV_SINGLE_ARG_DECL); // Execute the test, by default simply call activate_suppliers() virtual void dump_results (void); @@ -145,22 +145,22 @@ public: // and consumers, collect the latency and throughput results for // each and print the totals too. - virtual void disconnect_consumers (TAO_ENV_SINGLE_ARG_DECL); + virtual void disconnect_consumers (ACE_ENV_SINGLE_ARG_DECL); // Disconnect all the consumers. - virtual void disconnect_suppliers (TAO_ENV_SINGLE_ARG_DECL); + virtual void disconnect_suppliers (ACE_ENV_SINGLE_ARG_DECL); // Disconnect all the suppliers. - virtual void shutdown_consumers (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown_consumers (ACE_ENV_SINGLE_ARG_DECL); // Deactivate all the consumers. - virtual void shutdown_suppliers (TAO_ENV_SINGLE_ARG_DECL); + virtual void shutdown_suppliers (ACE_ENV_SINGLE_ARG_DECL); // Deactivate all the suppliers. - virtual void destroy_ec (TAO_ENV_SINGLE_ARG_DECL); + virtual void destroy_ec (ACE_ENV_SINGLE_ARG_DECL); // Call EC->destroy - virtual void deactivate_ec (TAO_ENV_SINGLE_ARG_DECL); + virtual void deactivate_ec (ACE_ENV_SINGLE_ARG_DECL); // De-activate the EC (and its helper classes). virtual void cleanup_ec (void); @@ -180,35 +180,35 @@ public: virtual void consumer_push (void* consumer_cookie, const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the consumers in the test has received an event virtual void consumer_shutdown (void* consumer_cookie - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the consumers has received a shutdown event virtual void consumer_disconnect (void* consumer_cookie - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the consumers in the test has been disconnected from the EC virtual void supplier_disconnect (void* supplier_cookie - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // One of the suppliers in the test has been disconnected from the EC #if !defined(EC_DISABLE_REMOTE_EC) - virtual void obtain_remote_ec (TAO_ENV_SINGLE_ARG_DECL); + virtual void obtain_remote_ec (ACE_ENV_SINGLE_ARG_DECL); // Obtain the EC from the Naming service virtual CosNaming::NamingContext_ptr - get_naming_context (TAO_ENV_SINGLE_ARG_DECL); + get_naming_context (ACE_ENV_SINGLE_ARG_DECL); #endif #if !defined(EC_DISABLE_OLD_EC) - virtual void initialize_old_ec (TAO_ENV_SINGLE_ARG_DECL); + virtual void initialize_old_ec (ACE_ENV_SINGLE_ARG_DECL); // Initialize the EC using the old implementation #endif - virtual void initialize_new_ec (TAO_ENV_SINGLE_ARG_DECL); + virtual void initialize_new_ec (ACE_ENV_SINGLE_ARG_DECL); // Initialize the EC using the old implementation virtual int allocate_consumers (void); @@ -223,7 +223,7 @@ public: virtual ACE_Task_Base* allocate_task (int i); // Allocate one task for supplier number <i> - virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL); + virtual void activate_tasks (ACE_ENV_SINGLE_ARG_DECL); // Activate all the tasks, by default runs each supplier on its // own thread. diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp index dc58d8ffe24..0eb220e760a 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.cpp +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.cpp @@ -24,7 +24,7 @@ EC_Supplier::EC_Supplier (EC_Driver *driver, void EC_Supplier::send_event (int event_number - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; @@ -45,12 +45,12 @@ EC_Supplier::send_event (int event_number this->event_type (event_number, event[0]); - this->send_event (event TAO_ENV_ARG_PARAMETER); + this->send_event (event ACE_ENV_ARG_PARAMETER); } void EC_Supplier::send_event (const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->lock_); @@ -69,7 +69,7 @@ EC_Supplier::send_event (const RtecEventComm::EventSet& event ACE_hrtime_t start = ACE_OS::gethrtime (); - this->consumer_proxy_->push (event TAO_ENV_ARG_PARAMETER); + this->consumer_proxy_->push (event ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_hrtime_t end = ACE_OS::gethrtime (); @@ -107,20 +107,20 @@ void EC_Supplier::connect (RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->consumer_proxy_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->connect (qos, shutdown_event_type TAO_ENV_ARG_PARAMETER); + this->connect (qos, shutdown_event_type ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; // @@ Throw? @@ -130,24 +130,24 @@ EC_Supplier::connect (const RtecEventChannelAdmin::SupplierQOS& qos, if (CORBA::is_nil (this->myself_.in ())) { - this->myself_ = this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->myself_ = this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } this->is_active_ = 1; this->consumer_proxy_->connect_push_supplier (this->myself_.in (), qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -EC_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +EC_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { if (CORBA::is_nil (this->consumer_proxy_.in ())) return; - this->consumer_proxy_->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_proxy_->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = @@ -155,29 +155,29 @@ EC_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) } void -EC_Supplier::shutdown (TAO_ENV_SINGLE_ARG_DECL) +EC_Supplier::shutdown (ACE_ENV_SINGLE_ARG_DECL) { if (!this->is_active_) return; // Deactivate the servant PortableServer::POA_var poa = - this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = - poa->servant_to_id (this TAO_ENV_ARG_PARAMETER); + poa->servant_to_id (this ACE_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); + poa->deactivate_object (id.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->is_active_ = 0; this->myself_ = RtecEventComm::PushSupplier::_nil (); } void -EC_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL) +EC_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->driver_->supplier_disconnect (this->cookie_ TAO_ENV_ARG_PARAMETER); + this->driver_->supplier_disconnect (this->cookie_ ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_proxy_ = RtecEventChannelAdmin::ProxyPushConsumer::_nil (); @@ -222,7 +222,7 @@ EC_Supplier_Task::EC_Supplier_Task (EC_Supplier* supplier, int EC_Supplier_Task::svc (void) { - TAO_ENV_DECLARE_NEW_ENV; + ACE_DECLARE_NEW_CORBA_ENV; // Initialize a time value to pace the test ACE_Time_Value tv (0, this->burst_pause_); @@ -252,7 +252,7 @@ EC_Supplier_Task::svc (void) now); // ACE_DEBUG ((LM_DEBUG, "(%t) supplier push event\n")); - this->supplier_->send_event (event TAO_ENV_ARG_PARAMETER); + this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -276,7 +276,7 @@ EC_Supplier_Task::svc (void) ACE_hrtime_t now = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, now); - this->supplier_->send_event (event TAO_ENV_ARG_PARAMETER); + this->supplier_->send_event (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK_EX (SHUTDOWN); } ACE_CATCH (CORBA::SystemException, sys_ex) diff --git a/TAO/orbsvcs/tests/Event/lib/Supplier.h b/TAO/orbsvcs/tests/Event/lib/Supplier.h index d66ab89d90e..9ce8e6b930a 100644 --- a/TAO/orbsvcs/tests/Event/lib/Supplier.h +++ b/TAO/orbsvcs/tests/Event/lib/Supplier.h @@ -54,39 +54,39 @@ public: // publications, this is useful for filtering tests. void send_event (int event_number - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // The types of the event is chosen by the driver, based on the // cookie and the <event_number> void send_event (const RtecEventComm::EventSet& event - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Send <event> to the EC. void send_event (int event_number, const RtecEventComm::Event& event); // Set the event type and source in <event> - void send_shutdown (TAO_ENV_SINGLE_ARG_DECL); + void send_shutdown (ACE_ENV_SINGLE_ARG_DECL); // Send a shutdown event. virtual void connect ( RtecEventChannelAdmin::SupplierAdmin_ptr supplier_admin, const RtecEventChannelAdmin::SupplierQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect using a <supplier_admin> and publications (<qos>) // computed by the user virtual void connect ( const RtecEventChannelAdmin::SupplierQOS& qos, int shutdown_event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); // Connect using the current consumer_proxy (useful for reconnect test) - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, also deactivates the object - void shutdown (TAO_ENV_SINGLE_ARG_DECL); + void shutdown (ACE_ENV_SINGLE_ARG_DECL); // Disconnect from the EC, also deactivates the object virtual void dump_results (const char* name, @@ -101,7 +101,7 @@ public: // Return an event type to push.... // = The PushSupplier methods - virtual void disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); private: |