diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/EC_Colocated_Latency')
9 files changed, 62 insertions, 62 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 |