diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests')
57 files changed, 490 insertions, 490 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp index 2110f1b4821..bfd0ef01252 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.cpp @@ -19,10 +19,10 @@ ECCL_Consumer::ECCL_Consumer (int iterations) void ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, int event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -31,12 +31,12 @@ ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -53,12 +53,12 @@ ECCL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECCL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECCL_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -70,17 +70,17 @@ ECCL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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; } @@ -92,7 +92,7 @@ ECCL_Consumer::sample_history (void) void ECCL_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 now = ACE_OS::gethrtime (); @@ -106,7 +106,7 @@ ECCL_Consumer::push (const RtecEventComm::EventSet &events } void -ECCL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECCL_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.h index 5fe9f00fce7..362f1eda087 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Consumer.h @@ -34,10 +34,10 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec, int event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); /// Access the history of samples ACE_Sample_History &sample_history (void); @@ -46,9 +46,9 @@ public: /** @name 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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/POA_Destroyer.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/POA_Destroyer.cpp index dd1547a0ce2..c4f20a5d71b 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/POA_Destroyer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/POA_Destroyer.cpp @@ -20,7 +20,7 @@ POA_Destroyer::~POA_Destroyer () ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { this->poa_->destroy (1, 1 - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { // @@ This event should be logged... diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Receive_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Receive_Task.cpp index c0debdfdeb0..75d85a1855e 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Receive_Task.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Receive_Task.cpp @@ -21,7 +21,7 @@ ECCL_Receive_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Send_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Send_Task.cpp index f0aeb55a35e..d8f7fb52531 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Send_Task.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Send_Task.cpp @@ -59,7 +59,7 @@ ECCL_Send_Task::svc (void) ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); // push one event... - this->supplier_->push (event TAO_ENV_ARG_PARAMETER); + this->supplier_->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } return 0; diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Servant_var.cpp index 3c561bbbcf6..ed361ffcaf6 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Servant_var.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Servant_var.cpp @@ -24,7 +24,7 @@ Servant_var<SERVANT>::~Servant_var () ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { // @@ This event should be logged... diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.cpp index a6d5e229b09..50addaa52b2 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.cpp @@ -18,10 +18,10 @@ ECCL_Supplier::ECCL_Supplier (void) void ECCL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, int event_type - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -30,12 +30,12 @@ ECCL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -47,12 +47,12 @@ ECCL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECCL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECCL_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -64,23 +64,23 @@ ECCL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECCL_Supplier::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -90,12 +90,12 @@ ECCL_Supplier::push (const RtecEventComm::EventSet &events return; proxy = this->proxy_consumer_; } - proxy->push (events TAO_ENV_ARG_PARAMETER); + proxy->push (events ACE_ENV_ARG_PARAMETER); } void -ECCL_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECCL_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.h index 4f16f7114d5..6319c5c591d 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/Supplier.h @@ -32,19 +32,19 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec, int event_type - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/driver.cpp b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/driver.cpp index daad4719e5c..f86ea773fc6 100644 --- a/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/driver.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Colocated_Latency/driver.cpp @@ -90,7 +90,7 @@ int main (int argc, char *argv[]) int high_priority = ACE_Sched_Params::next_priority (ACE_SCHED_FIFO, process_priority); - + // Enable FIFO scheduling, e.g., RT scheduling class on Solaris. if (ACE_OS::sched_params (ACE_Sched_Params (ACE_SCHED_FIFO, @@ -111,17 +111,17 @@ int 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; 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; @@ -132,19 +132,19 @@ int 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; 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; 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; if (CORBA::is_nil (root_poa.in ())) @@ -155,13 +155,13 @@ int main (int argc, char *argv[]) POA_Destroyer destroy_poa (root_poa.in ()); 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; if (parse_args (argc, argv) != 0) return 1; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), @@ -172,20 +172,20 @@ int main (int argc, char *argv[]) 1); PortableServer::ServantBase_var ec_owner (ec_impl); - 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; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; int thread_count = 1; if (disable_low_priority == 0) thread_count += nthreads; - ACE_Barrier barrier (thread_count); + ACE_Barrier barrier (thread_count); ACE_Auto_Basic_Array_Ptr<Servant_var<ECCL_Supplier> > low_priority_suppliers (new Servant_var<ECCL_Supplier>[nthreads]); ACE_Auto_Basic_Array_Ptr<Servant_var<ECCL_Consumer> > low_priority_consumers (new Servant_var<ECCL_Consumer>[nthreads]); @@ -196,14 +196,14 @@ int main (int argc, char *argv[]) Servant_var<ECCL_Supplier> (new ECCL_Supplier); low_priority_suppliers[i]->connect (ec.in (), ACE_ES_EVENT_UNDEFINED + 1 + i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; low_priority_consumers[i] = Servant_var<ECCL_Consumer> (new ECCL_Consumer (iterations)); low_priority_consumers[i]->connect (ec.in (), ACE_ES_EVENT_UNDEFINED + 1 + i - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; low_priority_tasks[i].init (iterations, @@ -220,15 +220,15 @@ int main (int argc, char *argv[]) low_priority); } } - + Servant_var<ECCL_Consumer> consumer_impl (new ECCL_Consumer (iterations)); consumer_impl->connect (ec.in (), ACE_ES_EVENT_UNDEFINED - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Servant_var<ECCL_Supplier> supplier_impl (new ECCL_Supplier); supplier_impl->connect (ec.in (), ACE_ES_EVENT_UNDEFINED - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ECCL_Send_Task high_priority_task; @@ -268,25 +268,25 @@ int main (int argc, char *argv[]) } low_priority_stats.dump_results ("Low Priority", gsf); - supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - consumer_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; for (int j = 0; j != nthreads; ++j) { - low_priority_suppliers[j]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + low_priority_suppliers[j]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - low_priority_consumers[j]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + low_priority_consumers[j]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - ec_impl->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp index ff02cc9589d..055f397a0c9 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp @@ -22,10 +22,10 @@ ECFL_Consumer:: void ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -34,12 +34,12 @@ ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -57,12 +57,12 @@ ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFL_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -74,17 +74,17 @@ ECFL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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; } @@ -96,7 +96,7 @@ ECFL_Consumer::samples (void) const void ECFL_Consumer::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Consumer::push (%P|%t)\n")); @@ -113,7 +113,7 @@ ECFL_Consumer::push (const RtecEventComm::EventSet &events } void -ECFL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFL_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h index 80123bce02b..8f5b9edf0f7 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h @@ -34,10 +34,10 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); /// Get the samples const Control::Samples &samples (void) const; @@ -46,9 +46,9 @@ public: /** @name 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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp index bac145852a7..95b888fbe2f 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp @@ -37,7 +37,7 @@ ECFL_Coordinator::~ECFL_Coordinator (void) void ECFL_Coordinator::join (Control::Peer_ptr peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -59,14 +59,14 @@ ECFL_Coordinator::join (Control::Peer_ptr peer for (i = 0; i != this->peers_count_; ++i) { RtecEventChannelAdmin::EventChannel_var channel = - this->peers_[i]->channel (TAO_ENV_SINGLE_ARG_PARAMETER); + this->peers_[i]->channel (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (size_t j = 0; j != this->peers_count_; ++j) { if (i != j) { - this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER); + this->peers_[j]->connect (channel.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -92,7 +92,7 @@ ECFL_Coordinator::join (Control::Peer_ptr peer { loopbacks[lcount++] = this->peers_[j]->setup_loopback (experiment_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -101,12 +101,12 @@ ECFL_Coordinator::join (Control::Peer_ptr peer this->peers_[i]->run_experiment (experiment_id, this->iterations_, gsf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; for (j = 0; j != lcount; ++j) { - loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + loopbacks[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -127,10 +127,10 @@ ECFL_Coordinator::join (Control::Peer_ptr peer for (i = 0; i != this->peers_count_; ++i) { - this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->peers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h index be2be30a0da..db6863642a1 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h @@ -38,7 +38,7 @@ public: /** @name The Control::Coordinator methods */ virtual void join (Control::Peer_ptr peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp index 2b296599d05..d600dc245c2 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp @@ -18,13 +18,13 @@ ECFL_Loopback::ECFL_Loopback (void) void ECFL_Loopback::init (CORBA::Long experiment_id, RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->supplier_ = Servant_var<ECFL_Loopback_Supplier> ( new ECFL_Loopback_Supplier (experiment_id) ); - this->supplier_->connect (ec TAO_ENV_ARG_PARAMETER); + this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_ = @@ -32,30 +32,30 @@ ECFL_Loopback::init (CORBA::Long experiment_id, new ECFL_Loopback_Consumer (experiment_id, this->supplier_.in ()) ); - this->consumer_->connect (ec TAO_ENV_ARG_PARAMETER); + this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Loopback::destroy (TAO_ENV_SINGLE_ARG_DECL) +ECFL_Loopback::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->consumer_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->supplier_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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; } diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h index 94492c347b1..10a79a9d3ac 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h @@ -34,12 +34,12 @@ public: /// Initialize the loopback void init (CORBA::Long experiment_id, RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@{ /** @name The Control::Loopback methods */ - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp index 6eb56cfaf91..247af976547 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp @@ -23,10 +23,10 @@ ECFL_Loopback_Consumer:: void ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -35,12 +35,12 @@ ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -58,12 +58,12 @@ ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFL_Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -75,31 +75,31 @@ ECFL_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECFL_Loopback_Consumer::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n")); - this->supplier_->push (events TAO_ENV_ARG_PARAMETER); + this->supplier_->push (events ACE_ENV_ARG_PARAMETER); } void -ECFL_Loopback_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFL_Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h index 8138c3f9040..92b0b25515a 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h @@ -35,18 +35,18 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); //@{ /** @name 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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp index 1e9e90cf4a4..e7774668249 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp @@ -18,10 +18,10 @@ ECFL_Loopback_Supplier::ECFL_Loopback_Supplier (CORBA::Long experiment_id) void ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -30,12 +30,12 @@ ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -48,12 +48,12 @@ ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFL_Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFL_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -101,11 +101,11 @@ ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source events[i].header.source = this->experiment_id_; } - proxy->push (events TAO_ENV_ARG_PARAMETER); + proxy->push (events ACE_ENV_ARG_PARAMETER); } void -ECFL_Loopback_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFL_Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h index 4dc341bab47..d1e6c14d1bb 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h @@ -36,19 +36,19 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp index 0be4f180ce6..fe25ff09ca2 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp @@ -35,23 +35,23 @@ ECFL_Peer::~ECFL_Peer (void) void ECFL_Peer::init (PortableServer::POA_ptr root_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Event_Channel_Attributes attr (root_poa, root_poa); Servant_var<TAO_EC_Event_Channel> ec_impl ( new TAO_EC_Event_Channel (attr) ); - ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_channel_ = - ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::EventChannel_ptr -ECFL_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFL_Peer::channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RtecEventChannelAdmin::EventChannel::_duplicate (this->event_channel_.in ()); @@ -59,23 +59,23 @@ ECFL_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void ECFL_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n")); Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP); gateway->init (remote_ec, this->event_channel_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_var observer = - gateway->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + gateway->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_Handle h = this->event_channel_->append_observer (observer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; gateway->observer_handle (h); @@ -83,24 +83,24 @@ ECFL_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec Control::Loopback_ptr ECFL_Peer::setup_loopback (CORBA::Long experiment_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<ECFL_Loopback> loopback (new ECFL_Loopback); loopback->init (experiment_id, this->event_channel_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Control::Loopback::_nil ()); - return loopback->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return loopback->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } Control::Samples * ECFL_Peer::run_experiment (CORBA::Long experiment_id, CORBA::Long iterations, CORBA::Long_out gsf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<ECFL_Consumer> consumer ( @@ -108,14 +108,14 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id, iterations) ); - consumer->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER); + consumer->connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); Servant_var<ECFL_Supplier> supplier ( new ECFL_Supplier (experiment_id) ); - supplier->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER); + supplier->connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n")); @@ -132,13 +132,13 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id, ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); // push one event... - supplier->push (event TAO_ENV_ARG_PARAMETER); + supplier->push (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } - supplier->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - consumer->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ....")); @@ -150,13 +150,13 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id, } void -ECFL_Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +ECFL_Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h index 2db57627b86..4c0c5f5b419 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h @@ -33,30 +33,30 @@ public: /// Initialize the peer void init (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@{ /** @name The Control::Peer methods */ virtual RtecEventChannelAdmin::EventChannel_ptr - channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Control::Samples* run_experiment (CORBA::Long experiment_id, CORBA::Long iterations, CORBA::Long_out gsf - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp index 6a0d81d8dbe..230aded84df 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp @@ -23,7 +23,7 @@ Servant_var<SERVANT>::~Servant_var () ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { // @@ This event should be logged... diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp index 74308570630..d0aece05d83 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp @@ -18,10 +18,10 @@ ECFL_Supplier::ECFL_Supplier (CORBA::Long experiment_id) void ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -30,12 +30,12 @@ ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -48,12 +48,12 @@ ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFL_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECFL_Supplier::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -92,11 +92,11 @@ ECFL_Supplier::push (const RtecEventComm::EventSet &events proxy = this->proxy_consumer_; } - proxy->push (events TAO_ENV_ARG_PARAMETER); + proxy->push (events ACE_ENV_ARG_PARAMETER); } void -ECFL_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFL_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h index 3034cd976f6..08d3313fcec 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h @@ -36,19 +36,19 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp index cf194f76ae1..cd0ed1bc642 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/client.cpp @@ -68,7 +68,7 @@ int 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 (parse_args (argc, argv) != 0) @@ -76,12 +76,12 @@ int main (int argc, char *argv[]) // Get the event channel object reference CORBA::Object_var coordinator_object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Control::Coordinator_var coordinator = Control::Coordinator::_narrow (coordinator_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) @@ -93,12 +93,12 @@ int main (int argc, char *argv[]) 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; @@ -109,19 +109,19 @@ int 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; 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; 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; if (CORBA::is_nil (root_poa.in ())) @@ -130,32 +130,32 @@ int main (int argc, char *argv[]) 1); 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; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Servant_var<ECFL_Peer> peer_impl (new ECFL_Peer (orb.in ())); - peer_impl->init (root_poa.in () TAO_ENV_ARG_PARAMETER); + peer_impl->init (root_poa.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Control::Peer_var peer (peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); + Control::Peer_var peer (peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; - coordinator->join (peer.in () TAO_ENV_ARG_PARAMETER); + coordinator->join (peer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp index a3b8a62dbc9..a59c25cd6a0 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp @@ -83,7 +83,7 @@ int 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 (parse_args (argc, argv) != 0) @@ -91,12 +91,12 @@ int main (int argc, char *argv[]) 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; @@ -107,19 +107,19 @@ int 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; 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; 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; if (CORBA::is_nil (root_poa.in ())) @@ -128,10 +128,10 @@ int main (int argc, char *argv[]) 1); 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; Servant_var<ECFL_Coordinator> coordinator_impl ( @@ -142,11 +142,11 @@ int main (int argc, char *argv[]) ); Control::Coordinator_var coordinator = - coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the ior to the <ior_output_file> @@ -159,18 +159,18 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_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/performance-tests/EC_Federated_Scalability/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp index fffdd125558..a8ccdc51f45 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp @@ -22,10 +22,10 @@ ECFS_Consumer:: void ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -34,12 +34,12 @@ ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -57,12 +57,12 @@ ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFS_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -74,17 +74,17 @@ ECFS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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; } @@ -96,7 +96,7 @@ ECFS_Consumer::samples (void) const void ECFS_Consumer::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Consumer::push (%P|%t)\n")); @@ -113,7 +113,7 @@ ECFS_Consumer::push (const RtecEventComm::EventSet &events } void -ECFS_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFS_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h index 2bc43a51edd..d7482e22e58 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h @@ -34,10 +34,10 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); /// Get the samples const Control::Samples &samples (void) const; @@ -46,9 +46,9 @@ public: /** @name 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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp index deb71c18f93..db1499aa26f 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp @@ -37,7 +37,7 @@ ECFS_Coordinator::~ECFS_Coordinator (void) void ECFS_Coordinator::join (Control::Peer_ptr peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -59,14 +59,14 @@ ECFS_Coordinator::join (Control::Peer_ptr peer for (i = 0; i != this->peers_count_; ++i) { RtecEventChannelAdmin::EventChannel_var channel = - this->peers_[i]->channel (TAO_ENV_SINGLE_ARG_PARAMETER); + this->peers_[i]->channel (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; for (size_t j = 0; j != this->peers_count_; ++j) { if (i != j) { - this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER); + this->peers_[j]->connect (channel.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -89,7 +89,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer { loopbacks[lcount++] = this->peers_[j]->setup_loopback (experiment_id - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -106,7 +106,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer experiment_id, this->iterations_, gsf - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Sample_History history (samples->length ()); @@ -149,7 +149,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer for (j = 0; j != lcount; ++j) { - loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + loopbacks[j]->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -158,10 +158,10 @@ ECFS_Coordinator::join (Control::Peer_ptr peer for (i = 0; i != this->peers_count_; ++i) { - this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); + this->peers_[i]->shutdown (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h index b132052d174..582556a9419 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h @@ -39,7 +39,7 @@ public: /** @name The Control::Coordinator methods */ virtual void join (Control::Peer_ptr peer - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp index 7492cf40eb2..9143fde3978 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp @@ -18,13 +18,13 @@ ECFS_Loopback::ECFS_Loopback (void) void ECFS_Loopback::init (CORBA::Long experiment_id, RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { this->supplier_ = Servant_var<ECFS_Loopback_Supplier> ( new ECFS_Loopback_Supplier (experiment_id) ); - this->supplier_->connect (ec TAO_ENV_ARG_PARAMETER); + this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; this->consumer_ = @@ -32,30 +32,30 @@ ECFS_Loopback::init (CORBA::Long experiment_id, new ECFS_Loopback_Consumer (experiment_id, this->supplier_.in ()) ); - this->consumer_->connect (ec TAO_ENV_ARG_PARAMETER); + this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback::destroy (TAO_ENV_SINGLE_ARG_DECL) +ECFS_Loopback::destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->consumer_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->consumer_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->supplier_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + this->supplier_->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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; } diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h index 7dc5200feed..64e656a84fc 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h @@ -34,12 +34,12 @@ public: /// Initialize the loopback void init (CORBA::Long experiment_id, RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@{ /** @name The Control::Loopback methods */ - virtual void destroy (TAO_ENV_SINGLE_ARG_DECL) + virtual void destroy (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp index 64635655256..f03b4b6b323 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp @@ -23,10 +23,10 @@ ECFS_Loopback_Consumer:: void ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -35,12 +35,12 @@ ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -58,12 +58,12 @@ ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFS_Loopback_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -75,31 +75,31 @@ ECFS_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECFS_Loopback_Consumer::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n")); - this->supplier_->push (events TAO_ENV_ARG_PARAMETER); + this->supplier_->push (events ACE_ENV_ARG_PARAMETER); } void -ECFS_Loopback_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFS_Loopback_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h index c39f3bb945f..a90ec03e1a7 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h @@ -35,18 +35,18 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); //@{ /** @name 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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp index 341fabcdaac..a76009be6f6 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp @@ -18,10 +18,10 @@ ECFS_Loopback_Supplier::ECFS_Loopback_Supplier (CORBA::Long experiment_id) void ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -30,12 +30,12 @@ ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -48,12 +48,12 @@ ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFS_Loopback_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFS_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -101,11 +101,11 @@ ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source events[i].header.source = this->experiment_id_; } - proxy->push (events TAO_ENV_ARG_PARAMETER); + proxy->push (events ACE_ENV_ARG_PARAMETER); } void -ECFS_Loopback_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFS_Loopback_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h index c09ae40a254..309ebcf247d 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h @@ -36,19 +36,19 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp index 744aa2d2acf..78b3d0cb240 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp @@ -33,23 +33,23 @@ ECFS_Peer::~ECFS_Peer (void) void ECFS_Peer::init (PortableServer::POA_ptr root_poa - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { TAO_EC_Event_Channel_Attributes attr (root_poa, root_poa); Servant_var<TAO_EC_Event_Channel> ec_impl ( new TAO_EC_Event_Channel (attr) ); - ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_channel_ = - ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + ec_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::EventChannel_ptr -ECFS_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFS_Peer::channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RtecEventChannelAdmin::EventChannel::_duplicate (this->event_channel_.in ()); @@ -57,23 +57,23 @@ ECFS_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) void ECFS_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n")); Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP); gateway->init (remote_ec, this->event_channel_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_var observer = - gateway->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + gateway->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_Handle h = this->event_channel_->append_observer (observer.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; gateway->observer_handle (h); @@ -81,17 +81,17 @@ ECFS_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec Control::Loopback_ptr ECFS_Peer::setup_loopback (CORBA::Long experiment_id - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<ECFS_Loopback> loopback (new ECFS_Loopback); loopback->init (experiment_id, this->event_channel_.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Control::Loopback::_nil ()); - return loopback->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + return loopback->_this (ACE_ENV_SINGLE_ARG_PARAMETER); } Control::Samples * @@ -99,7 +99,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count, CORBA::Long experiment_id, CORBA::Long iterations, CORBA::Long_out gsf - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<ECFS_Consumer> *consumer; @@ -113,7 +113,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count, consumer[i] = Servant_var<ECFS_Consumer> (new ECFS_Consumer (experiment_id, iterations)); - consumer[i]->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER); + consumer[i]->connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -121,7 +121,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count, new ECFS_Supplier (experiment_id) ); - supplier->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER); + supplier->connect (this->event_channel_.in () ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n")); @@ -138,11 +138,11 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count, ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); // push one event... - supplier->push (event TAO_ENV_ARG_PARAMETER); + supplier->push (event ACE_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } - supplier->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); Control::Samples_var samples (new Control::Samples (iterations)); @@ -159,7 +159,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count, if (samples[j] < sample) samples[j] = sample; } - consumer[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -172,13 +172,13 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count, } void -ECFS_Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL) +ECFS_Peer::shutdown (ACE_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + this->event_channel_->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER); + this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_CHECK; } diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h index e5c1d1cf133..2e236e74cf3 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h @@ -33,31 +33,31 @@ public: /// Initialize the peer void init (PortableServer::POA_ptr poa - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); //@{ /** @name The Control::Peer methods */ virtual RtecEventChannelAdmin::EventChannel_ptr - channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + channel (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); virtual Control::Samples* run_experiment (CORBA::Long consumer_count, CORBA::Long experiment_id, CORBA::Long iterations, CORBA::Long_out gsf - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) + virtual void shutdown (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp index 7e01fd080ab..dfa14247b62 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp @@ -23,7 +23,7 @@ Servant_var<SERVANT>::~Servant_var () ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER); + this->ptr_->_remove_ref (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY { // @@ This event should be logged... diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp index 1c8552ab74a..38beb38dad3 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp @@ -18,10 +18,10 @@ ECFS_Supplier::ECFS_Supplier (CORBA::Long experiment_id) void ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -30,12 +30,12 @@ ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -48,12 +48,12 @@ ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECFS_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECFS_Supplier::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -92,11 +92,11 @@ ECFS_Supplier::push (const RtecEventComm::EventSet &events proxy = this->proxy_consumer_; } - proxy->push (events TAO_ENV_ARG_PARAMETER); + proxy->push (events ACE_ENV_ARG_PARAMETER); } void -ECFS_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECFS_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h index 83349929b40..e70ccde26ec 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h @@ -36,19 +36,19 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp index c1b5fa3c689..18661df8c8d 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp @@ -75,7 +75,7 @@ int 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 (parse_args (argc, argv) != 0) @@ -83,12 +83,12 @@ int main (int argc, char *argv[]) // Get the event channel object reference CORBA::Object_var coordinator_object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Control::Coordinator_var coordinator = Control::Coordinator::_narrow (coordinator_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) @@ -100,12 +100,12 @@ int main (int argc, char *argv[]) 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; @@ -116,19 +116,19 @@ int 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; 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; 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; if (CORBA::is_nil (root_poa.in ())) @@ -137,32 +137,32 @@ int main (int argc, char *argv[]) 1); 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; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Servant_var<ECFS_Peer> peer_impl (new ECFS_Peer (orb.in ())); - peer_impl->init (root_poa.in () TAO_ENV_ARG_PARAMETER); + peer_impl->init (root_poa.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Control::Peer_var peer (peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); + Control::Peer_var peer (peer_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; - coordinator->join (peer.in () TAO_ENV_ARG_PARAMETER); + coordinator->join (peer.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->destroy (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp index adb75216871..86b950bce2a 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp @@ -97,7 +97,7 @@ int 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 (parse_args (argc, argv) != 0) @@ -105,12 +105,12 @@ int main (int argc, char *argv[]) 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; @@ -121,19 +121,19 @@ int 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; 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; 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; if (CORBA::is_nil (root_poa.in ())) @@ -142,10 +142,10 @@ int main (int argc, char *argv[]) 1); 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; Servant_var<ECFS_Coordinator> coordinator_impl ( @@ -157,11 +157,11 @@ int main (int argc, char *argv[]) ); Control::Coordinator_var coordinator = - coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + coordinator_impl->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (coordinator.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the ior to the <ior_output_file> @@ -174,18 +174,18 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_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/performance-tests/EC_Latency/Client_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp index 3b398172a15..8e6c5e63781 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp @@ -21,7 +21,7 @@ ECL_Client_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp index 2e020bbd26f..43d1fcefc86 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp @@ -18,10 +18,10 @@ ECL_Consumer::ECL_Consumer (int iterations) void ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -30,12 +30,12 @@ ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -52,12 +52,12 @@ ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECL_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -69,17 +69,17 @@ ECL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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; } @@ -91,7 +91,7 @@ ECL_Consumer::sample_history (void) void ECL_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 now = ACE_OS::gethrtime (); @@ -105,7 +105,7 @@ ECL_Consumer::push (const RtecEventComm::EventSet &events } void -ECL_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECL_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h index a05566c370b..aad7edae08d 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h @@ -33,10 +33,10 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); /// Access the history of samples ACE_Sample_History &sample_history (void); @@ -45,9 +45,9 @@ public: /** @name 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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp index 1712c4f496c..922d4056cd3 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp @@ -17,10 +17,10 @@ ECL_Supplier::ECL_Supplier (void) void ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -29,12 +29,12 @@ ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -46,12 +46,12 @@ ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECL_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -63,23 +63,23 @@ ECL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECL_Supplier::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -89,12 +89,12 @@ ECL_Supplier::push (const RtecEventComm::EventSet &events return; proxy = this->proxy_consumer_; } - proxy->push (events TAO_ENV_ARG_PARAMETER); + proxy->push (events ACE_ENV_ARG_PARAMETER); } void -ECL_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECL_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h index e9e26a788bf..1b582bc1619 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h @@ -31,19 +31,19 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp index 8375dd90263..cbec46f28e1 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp @@ -60,17 +60,17 @@ 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; 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; @@ -81,15 +81,15 @@ 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; 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 ())) @@ -98,14 +98,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) @@ -113,12 +113,12 @@ main (int argc, char *argv []) // Get the event channel object reference CORBA::Object_var ec_object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -133,7 +133,7 @@ main (int argc, char *argv []) 1); PortableServer::ServantBase_var consumer_owner (consumer_impl); - consumer_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER); + consumer_impl->connect (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ECL_Supplier *supplier_impl; @@ -142,7 +142,7 @@ main (int argc, char *argv []) 1); PortableServer::ServantBase_var supplier_owner (supplier_impl); - supplier_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER); + supplier_impl->connect (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n")); @@ -164,14 +164,14 @@ main (int argc, char *argv []) ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); // push one event... - supplier_impl->push (event TAO_ENV_ARG_PARAMETER); + supplier_impl->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_hrtime_t end = ACE_OS::gethrtime (); - consumer_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Calibrate the high resolution timer *before* starting the @@ -198,12 +198,12 @@ main (int argc, char *argv []) stats.samples_count ()); - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); - 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/performance-tests/EC_Latency/server.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp index 9dff9a44c29..7bce5ecf5e9 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/server.cpp @@ -67,17 +67,17 @@ int 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; 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; @@ -88,19 +88,19 @@ int 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; 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; 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; if (CORBA::is_nil (root_poa.in ())) @@ -109,13 +109,13 @@ int main (int argc, char *argv[]) 1); 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; if (parse_args (argc, argv) != 0) return 1; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), @@ -126,15 +126,15 @@ int main (int argc, char *argv[]) 1); PortableServer::ServantBase_var ec_owner (ec_impl); - 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 ior = - orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the ior to the <ior_output_file> @@ -147,18 +147,18 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_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/performance-tests/EC_Scalability/Client_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp index 0237a86f190..1d2f8d1deb9 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp @@ -21,7 +21,7 @@ ECS_Client_Task::svc (void) ACE_DECLARE_NEW_CORBA_ENV; ACE_TRY { - this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER); + this->orb_->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp index 788c0b061ca..3df58cd4170 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp @@ -18,10 +18,10 @@ ECS_Consumer::ECS_Consumer (int iterations) void ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_consumers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -30,12 +30,12 @@ ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_supplier_ = - consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_admin->obtain_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -52,12 +52,12 @@ ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_supplier_->connect_push_consumer (consumer.in (), consumer_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECS_Consumer::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -69,17 +69,17 @@ ECS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_supplier (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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; } @@ -91,7 +91,7 @@ ECS_Consumer::sample_history (void) void ECS_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 now = ACE_OS::gethrtime (); @@ -105,7 +105,7 @@ ECS_Consumer::push (const RtecEventComm::EventSet &events } void -ECS_Consumer::disconnect_push_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECS_Consumer::disconnect_push_consumer (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h index 8f1aee4416a..e171ef566cc 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h @@ -33,10 +33,10 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); /// Access the history of samples ACE_Sample_History &sample_history (void); @@ -45,9 +45,9 @@ public: /** @name 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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp index 99dfd39610d..2212b38dab9 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp @@ -17,10 +17,10 @@ ECS_Supplier::ECS_Supplier (void) void ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (TAO_ENV_SINGLE_ARG_PARAMETER); + ec->for_suppliers (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; { @@ -29,12 +29,12 @@ ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec return; this->proxy_consumer_ = - supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_admin->obtain_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); + this->_this (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -46,12 +46,12 @@ ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec this->proxy_consumer_->connect_push_supplier (supplier.in (), supplier_qos - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) +ECS_Supplier::disconnect (ACE_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -63,23 +63,23 @@ ECS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) ACE_TRY { - proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); + proxy->disconnect_push_consumer (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); + PortableServer::POA_var poa = this->_default_POA (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; PortableServer::ObjectId_var id = poa->servant_to_id (this - TAO_ENV_ARG_PARAMETER); + 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 ECS_Supplier::push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL) + ACE_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -89,12 +89,12 @@ ECS_Supplier::push (const RtecEventComm::EventSet &events return; proxy = this->proxy_consumer_; } - proxy->push (events TAO_ENV_ARG_PARAMETER); + proxy->push (events ACE_ENV_ARG_PARAMETER); } void -ECS_Supplier::disconnect_push_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) +ECS_Supplier::disconnect_push_supplier (ACE_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h index 3feeb4460ab..a3482b21e40 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h @@ -33,19 +33,19 @@ public: /// Connect to the event channel void connect (RtecEventChannelAdmin::EventChannel_ptr ec - TAO_ENV_ARG_DECL); + ACE_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (TAO_ENV_SINGLE_ARG_DECL); + void disconnect (ACE_ENV_SINGLE_ARG_DECL); void push (const RtecEventComm::EventSet &events - TAO_ENV_ARG_DECL_NOT_USED) + ACE_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::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)); //@} diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp index bb301cda0c9..aed51b1b9b6 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp @@ -58,17 +58,17 @@ 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; 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; @@ -79,15 +79,15 @@ 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; 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 ())) @@ -96,14 +96,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) @@ -111,12 +111,12 @@ main (int argc, char *argv []) // Get the event channel object reference CORBA::Object_var ec_object = - orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); + orb->string_to_object (ior ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () - TAO_ENV_ARG_PARAMETER); + ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -135,7 +135,7 @@ main (int argc, char *argv []) ACE_NEW_RETURN (consumer_impl[i], ECS_Consumer (iterations), 1); - consumer_impl[i]->connect (ec.in () TAO_ENV_ARG_PARAMETER); + consumer_impl[i]->connect (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -145,7 +145,7 @@ main (int argc, char *argv []) 1); PortableServer::ServantBase_var supplier_owner (supplier_impl); - supplier_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER); + supplier_impl->connect (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n")); @@ -167,17 +167,17 @@ main (int argc, char *argv []) ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); // push one event... - supplier_impl->push (event TAO_ENV_ARG_PARAMETER); + supplier_impl->push (event ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_hrtime_t end = ACE_OS::gethrtime (); for (i = 0; i != consumer_count; ++i) { - consumer_impl[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + consumer_impl[i]->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); + supplier_impl->disconnect (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Calibrate the high resolution timer *before* starting the @@ -219,12 +219,12 @@ main (int argc, char *argv []) stats.samples_count ()); - orb->shutdown (0 TAO_ENV_ARG_PARAMETER); + orb->shutdown (0 ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); - 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/performance-tests/EC_Scalability/server.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp index 43f43105d4d..8314c02b3ba 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp @@ -74,17 +74,17 @@ int 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; 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; @@ -95,19 +95,19 @@ int 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; 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; 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; if (CORBA::is_nil (root_poa.in ())) @@ -116,13 +116,13 @@ int main (int argc, char *argv[]) 1); 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; if (parse_args (argc, argv) != 0) return 1; - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), @@ -133,15 +133,15 @@ int main (int argc, char *argv[]) 1); PortableServer::ServantBase_var ec_owner (ec_impl); - 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 ior = - orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); + orb->object_to_string (ec.in () ACE_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the ior to the <ior_output_file> @@ -154,18 +154,18 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); + poa_manager->activate (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); + orb->run (ACE_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); + root_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 |