diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2001-12-08 21:59:30 +0000 |
| commit | 63165b00e2d667e39e15cf084128d94a563d484e (patch) | |
| tree | 6939cf1ed0a80ce8a3224d33f3d23c0e1b9a517f /TAO/orbsvcs/performance-tests | |
| parent | 6579bccb3a3f22f882ef908ad5f7e1a65b00b133 (diff) | |
| download | ATCD-63165b00e2d667e39e15cf084128d94a563d484e.tar.gz | |
Merged corba-env-clean branch.
Diffstat (limited to 'TAO/orbsvcs/performance-tests')
48 files changed, 588 insertions, 583 deletions
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp index 2f34eb9ea7a..ff02cc9589d 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.cpp @@ -21,11 +21,11 @@ ECFL_Consumer:: } void -ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_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 (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -56,13 +56,13 @@ ECFL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, h1.source = this->experiment_id_; this->proxy_supplier_->connect_push_consumer (consumer.in (), - consumer_qos, - ACE_TRY_ENV); + consumer_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECFL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -74,17 +74,17 @@ ECFL_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -95,8 +95,8 @@ ECFL_Consumer::samples (void) const } void -ECFL_Consumer::push (const RtecEventComm::EventSet &events, - CORBA::Environment &) +ECFL_Consumer::push (const RtecEventComm::EventSet &events + TAO_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 (CORBA::Environment &) +ECFL_Consumer::disconnect_push_consumer (TAO_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 ccd7b62d19b..80123bce02b 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Consumer.h @@ -33,11 +33,11 @@ public: CORBA::ULong iterations); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); /// Get the samples const Control::Samples &samples (void) const; @@ -45,10 +45,10 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_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 bb72eb05cca..bac145852a7 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp @@ -12,7 +12,9 @@ #include "ace/Sample_History.h" #include "ace/Basic_Stats.h" -ACE_RCSID(EC_Federated_Latency, Coordinator, "$Id$") +ACE_RCSID (EC_Federated_Latency, + Coordinator, + "$Id$") ECFL_Coordinator::ECFL_Coordinator (int peers_expected, int iterations, @@ -34,8 +36,8 @@ ECFL_Coordinator::~ECFL_Coordinator (void) } void -ECFL_Coordinator::join (Control::Peer_ptr peer, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Coordinator::join (Control::Peer_ptr peer + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -57,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 (ACE_TRY_ENV); + this->peers_[i]->channel (TAO_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 (), ACE_TRY_ENV); + this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -89,8 +91,8 @@ ECFL_Coordinator::join (Control::Peer_ptr peer, if (j != i) { loopbacks[lcount++] = - this->peers_[j]->setup_loopback (experiment_id, - ACE_TRY_ENV); + this->peers_[j]->setup_loopback (experiment_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -98,13 +100,13 @@ ECFL_Coordinator::join (Control::Peer_ptr peer, Control::Samples_var samples = this->peers_[i]->run_experiment (experiment_id, this->iterations_, - gsf, - ACE_TRY_ENV); + gsf + TAO_ENV_ARG_PARAMETER); ACE_CHECK; for (j = 0; j != lcount; ++j) { - loopbacks[j]->destroy (ACE_TRY_ENV); + loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -125,10 +127,10 @@ ECFL_Coordinator::join (Control::Peer_ptr peer, for (i = 0; i != this->peers_count_; ++i) { - this->peers_[i]->shutdown (ACE_TRY_ENV); + this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_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 b719de9f6e5..be2be30a0da 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.h @@ -37,8 +37,8 @@ public: //@{ /** @name The Control::Coordinator methods */ - virtual void join (Control::Peer_ptr peer, - CORBA::Environment &ACE_TRY_ENV) + virtual void join (Control::Peer_ptr peer + TAO_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 a822c455157..2b296599d05 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.cpp @@ -17,14 +17,14 @@ ECFL_Loopback::ECFL_Loopback (void) void ECFL_Loopback::init (CORBA::Long experiment_id, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->supplier_ = Servant_var<ECFL_Loopback_Supplier> ( new ECFL_Loopback_Supplier (experiment_id) ); - this->supplier_->connect (ec, ACE_TRY_ENV); + this->supplier_->connect (ec TAO_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, ACE_TRY_ENV); + this->consumer_->connect (ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Loopback::destroy (CORBA::Environment &ACE_TRY_ENV) +ECFL_Loopback::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->consumer_->disconnect (ACE_TRY_ENV); + this->consumer_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->supplier_->disconnect (ACE_TRY_ENV); + this->supplier_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_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 33ae6ccf925..94492c347b1 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback.h @@ -33,13 +33,13 @@ public: /// Initialize the loopback void init (CORBA::Long experiment_id, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); //@{ /** @name The Control::Loopback methods */ - virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + virtual void destroy (TAO_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 1496fb5d63a..6eb56cfaf91 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.cpp @@ -22,11 +22,11 @@ ECFL_Loopback_Consumer:: } void -ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_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 (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -57,13 +57,13 @@ ECFL_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, h1.source = this->experiment_id_; this->proxy_supplier_->connect_push_consumer (consumer.in (), - consumer_qos, - ACE_TRY_ENV); + consumer_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Loopback_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECFL_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -75,31 +75,31 @@ ECFL_Loopback_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Loopback_Consumer::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Loopback_Consumer::push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n")); - this->supplier_->push (events, ACE_TRY_ENV); + this->supplier_->push (events TAO_ENV_ARG_PARAMETER); } void -ECFL_Loopback_Consumer::disconnect_push_consumer (CORBA::Environment &) +ECFL_Loopback_Consumer::disconnect_push_consumer (TAO_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 c4eadc6c87a..8138c3f9040 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Consumer.h @@ -34,19 +34,19 @@ public: ECFL_Loopback_Supplier *supplier); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_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 f08f6484765..1e9e90cf4a4 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.cpp @@ -17,11 +17,11 @@ ECFL_Loopback_Supplier::ECFL_Loopback_Supplier (CORBA::Long experiment_id) } void -ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_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 (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -47,13 +47,13 @@ ECFL_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, sh0.source = this->experiment_id_; this->proxy_consumer_->connect_push_supplier (supplier.in (), - supplier_qos, - ACE_TRY_ENV); + supplier_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Loopback_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECFL_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFL_Loopback_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Loopback_Supplier::push (const RtecEventComm::EventSet &source + TAO_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, ACE_TRY_ENV); + proxy->push (events TAO_ENV_ARG_PARAMETER); } void -ECFL_Loopback_Supplier::disconnect_push_supplier (CORBA::Environment &) +ECFL_Loopback_Supplier::disconnect_push_supplier (TAO_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 d34ea0eed89..4dc341bab47 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Loopback_Supplier.h @@ -35,20 +35,20 @@ public: ECFL_Loopback_Supplier (CORBA::Long experiment_id); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_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 b9bf1f89661..0be4f180ce6 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp @@ -20,7 +20,9 @@ #include "ace/High_Res_Timer.h" -ACE_RCSID(EC_Federated_Latency, Peer, "$Id$") +ACE_RCSID (EC_Federated_Latency, + Peer, + "$Id$") ECFL_Peer::ECFL_Peer (CORBA::ORB_ptr orb) : orb_ (CORBA::ORB::_duplicate (orb)) @@ -32,73 +34,73 @@ ECFL_Peer::~ECFL_Peer (void) } void -ECFL_Peer::init (PortableServer::POA_ptr root_poa, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Peer::init (PortableServer::POA_ptr root_poa + TAO_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 (ACE_TRY_ENV); + ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_channel_ = - ec_impl->_this (ACE_TRY_ENV); + ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::EventChannel_ptr -ECFL_Peer::channel (CORBA::Environment &) +ECFL_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RtecEventChannelAdmin::EventChannel::_duplicate (this->event_channel_.in ()); } void -ECFL_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec + TAO_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 (), - ACE_TRY_ENV); + this->event_channel_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_var observer = - gateway->_this (ACE_TRY_ENV); + gateway->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_Handle h = - this->event_channel_->append_observer (observer.in (), - ACE_TRY_ENV); + this->event_channel_->append_observer (observer.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; gateway->observer_handle (h); } Control::Loopback_ptr -ECFL_Peer::setup_loopback (CORBA::Long experiment_id, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Peer::setup_loopback (CORBA::Long experiment_id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<ECFL_Loopback> loopback (new ECFL_Loopback); loopback->init (experiment_id, - this->event_channel_.in (), - ACE_TRY_ENV); + this->event_channel_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Control::Loopback::_nil ()); - return loopback->_this (ACE_TRY_ENV); + return loopback->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } Control::Samples * ECFL_Peer::run_experiment (CORBA::Long experiment_id, CORBA::Long iterations, - CORBA::Long_out gsf, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Long_out gsf + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<ECFL_Consumer> consumer ( @@ -106,14 +108,14 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id, iterations) ); - consumer->connect (this->event_channel_.in (), ACE_TRY_ENV); + consumer->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); Servant_var<ECFL_Supplier> supplier ( new ECFL_Supplier (experiment_id) ); - supplier->connect (this->event_channel_.in (), ACE_TRY_ENV); + supplier->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); // ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n")); @@ -130,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, ACE_TRY_ENV); + supplier->push (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } - supplier->disconnect (ACE_TRY_ENV); + supplier->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); - consumer->disconnect (ACE_TRY_ENV); + consumer->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ....")); @@ -148,13 +150,13 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id, } void -ECFL_Peer::shutdown (CORBA::Environment &ACE_TRY_ENV) +ECFL_Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->event_channel_->destroy (ACE_TRY_ENV); + this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_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 be0c3e028bd..2db57627b86 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h @@ -32,31 +32,31 @@ public: virtual ~ECFL_Peer (void); /// Initialize the peer - void init (PortableServer::POA_ptr poa, - CORBA::Environment &ACE_TRY_ENV); + void init (PortableServer::POA_ptr poa + TAO_ENV_ARG_DECL); //@{ /** @name The Control::Peer methods */ virtual RtecEventChannelAdmin::EventChannel_ptr - channel (CORBA::Environment&) + channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec, - CORBA::Environment&) + virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id, - CORBA::Environment &) + Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id + TAO_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, - CORBA::Environment &) + CORBA::Long_out gsf + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment&) + virtual void shutdown (TAO_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 f4a796be00b..6a0d81d8dbe 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 (ACE_TRY_ENV); + this->ptr_->_remove_ref (TAO_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 0774b658e1a..74308570630 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.cpp @@ -17,11 +17,11 @@ ECFL_Supplier::ECFL_Supplier (CORBA::Long experiment_id) } void -ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_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 (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -47,13 +47,13 @@ ECFL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, sh0.source = this->experiment_id_; this->proxy_consumer_->connect_push_supplier (supplier.in (), - supplier_qos, - ACE_TRY_ENV); + supplier_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECFL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFL_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFL_Supplier::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +ECFL_Supplier::push (const RtecEventComm::EventSet &events + TAO_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, ACE_TRY_ENV); + proxy->push (events TAO_ENV_ARG_PARAMETER); } void -ECFL_Supplier::disconnect_push_supplier (CORBA::Environment &) +ECFL_Supplier::disconnect_push_supplier (TAO_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 fe1e8819fa8..3034cd976f6 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Supplier.h @@ -35,20 +35,20 @@ public: ECFL_Supplier (CORBA::Long experiment_id); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_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 9fe4702e6bf..92d8a54651d 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, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_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, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Control::Coordinator_var coordinator = - Control::Coordinator::_narrow (coordinator_object.in (), - ACE_TRY_ENV); + Control::Coordinator::_narrow (coordinator_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) @@ -92,13 +92,13 @@ int main (int argc, char *argv[]) } CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -108,20 +108,20 @@ int main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_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 (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Servant_var<ECFL_Peer> peer_impl (new ECFL_Peer (orb.in ())); - peer_impl->init (root_poa.in (), ACE_TRY_ENV); + peer_impl->init (root_poa.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Control::Peer_var peer (peer_impl->_this (ACE_TRY_ENV)); + Control::Peer_var peer (peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; - coordinator->join (peer.in (), ACE_TRY_ENV); + coordinator->join (peer.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_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 16b276bf0b0..a29e8e88813 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/server.cpp @@ -83,20 +83,20 @@ int main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -106,20 +106,20 @@ int main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_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 (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_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 (ACE_TRY_ENV); + coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (coordinator.in (), ACE_TRY_ENV); + orb->object_to_string (coordinator.in () TAO_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 (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_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 147a3c4152c..fffdd125558 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp @@ -21,11 +21,11 @@ ECFS_Consumer:: } void -ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_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 (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -56,13 +56,13 @@ ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, h1.source = this->experiment_id_; this->proxy_supplier_->connect_push_consumer (consumer.in (), - consumer_qos, - ACE_TRY_ENV); + consumer_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECFS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -74,17 +74,17 @@ ECFS_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -95,8 +95,8 @@ ECFS_Consumer::samples (void) const } void -ECFS_Consumer::push (const RtecEventComm::EventSet &events, - CORBA::Environment &) +ECFS_Consumer::push (const RtecEventComm::EventSet &events + TAO_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 (CORBA::Environment &) +ECFS_Consumer::disconnect_push_consumer (TAO_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 cd1d7428edc..2bc43a51edd 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h @@ -33,11 +33,11 @@ public: CORBA::ULong iterations); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); /// Get the samples const Control::Samples &samples (void) const; @@ -45,10 +45,10 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_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 41ac5aa08cf..d83acef5ae8 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp @@ -36,8 +36,8 @@ ECFS_Coordinator::~ECFS_Coordinator (void) } void -ECFS_Coordinator::join (Control::Peer_ptr peer, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Coordinator::join (Control::Peer_ptr peer + TAO_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 (ACE_TRY_ENV); + this->peers_[i]->channel (TAO_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 (), ACE_TRY_ENV); + this->peers_[j]->connect (channel.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -88,8 +88,8 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, if (j != i) { loopbacks[lcount++] = - this->peers_[j]->setup_loopback (experiment_id, - ACE_TRY_ENV); + this->peers_[j]->setup_loopback (experiment_id + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } } @@ -105,8 +105,8 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, this->peers_[i]->run_experiment (c, experiment_id, this->iterations_, - gsf, - ACE_TRY_ENV); + gsf + TAO_ENV_ARG_PARAMETER); ACE_CHECK; ACE_Sample_History history (samples->length ()); @@ -128,8 +128,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, for (CORBA::ULong k = 0; k != samples->length (); ++k) { history.sample (samples[k]); - ACE_OS::fprintf (output_file, - "HISTO: %d " ACE_UINT64_FORMAT_SPECIFIER "\n", + ACE_OS::fprintf (output_file, "HISTO: %d %lld\n", k, samples[k] / gsf); } ACE_OS::fclose (output_file); @@ -147,7 +146,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, for (j = 0; j != lcount; ++j) { - loopbacks[j]->destroy (ACE_TRY_ENV); + loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } @@ -156,10 +155,10 @@ ECFS_Coordinator::join (Control::Peer_ptr peer, for (i = 0; i != this->peers_count_; ++i) { - this->peers_[i]->shutdown (ACE_TRY_ENV); + this->peers_[i]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_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 a59e60a69d8..b132052d174 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h @@ -38,8 +38,8 @@ public: //@{ /** @name The Control::Coordinator methods */ - virtual void join (Control::Peer_ptr peer, - CORBA::Environment &ACE_TRY_ENV) + virtual void join (Control::Peer_ptr peer + TAO_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 b314b80feeb..7492cf40eb2 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp @@ -17,14 +17,14 @@ ECFS_Loopback::ECFS_Loopback (void) void ECFS_Loopback::init (CORBA::Long experiment_id, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { this->supplier_ = Servant_var<ECFS_Loopback_Supplier> ( new ECFS_Loopback_Supplier (experiment_id) ); - this->supplier_->connect (ec, ACE_TRY_ENV); + this->supplier_->connect (ec TAO_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, ACE_TRY_ENV); + this->consumer_->connect (ec TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback::destroy (CORBA::Environment &ACE_TRY_ENV) +ECFS_Loopback::destroy (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_TRY { - this->consumer_->disconnect (ACE_TRY_ENV); + this->consumer_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - this->supplier_->disconnect (ACE_TRY_ENV); + this->supplier_->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_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 32ff0f92c8b..7dc5200feed 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h @@ -33,13 +33,13 @@ public: /// Initialize the loopback void init (CORBA::Long experiment_id, - RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); //@{ /** @name The Control::Loopback methods */ - virtual void destroy (CORBA::Environment &ACE_TRY_ENV) + virtual void destroy (TAO_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 1d6451510d7..64635655256 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp @@ -22,11 +22,11 @@ ECFS_Loopback_Consumer:: } void -ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_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 (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -57,13 +57,13 @@ ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, h1.source = this->experiment_id_; this->proxy_supplier_->connect_push_consumer (consumer.in (), - consumer_qos, - ACE_TRY_ENV); + consumer_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECFS_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -75,31 +75,31 @@ ECFS_Loopback_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback_Consumer::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Loopback_Consumer::push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n")); - this->supplier_->push (events, ACE_TRY_ENV); + this->supplier_->push (events TAO_ENV_ARG_PARAMETER); } void -ECFS_Loopback_Consumer::disconnect_push_consumer (CORBA::Environment &) +ECFS_Loopback_Consumer::disconnect_push_consumer (TAO_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 50a8ec67e24..c39f3bb945f 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h @@ -34,19 +34,19 @@ public: ECFS_Loopback_Supplier *supplier); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_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 5259385fa1f..341fabcdaac 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp @@ -17,11 +17,11 @@ ECFS_Loopback_Supplier::ECFS_Loopback_Supplier (CORBA::Long experiment_id) } void -ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_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 (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -47,13 +47,13 @@ ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, sh0.source = this->experiment_id_; this->proxy_consumer_->connect_push_supplier (supplier.in (), - supplier_qos, - ACE_TRY_ENV); + supplier_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECFS_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFS_Loopback_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source + TAO_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, ACE_TRY_ENV); + proxy->push (events TAO_ENV_ARG_PARAMETER); } void -ECFS_Loopback_Supplier::disconnect_push_supplier (CORBA::Environment &) +ECFS_Loopback_Supplier::disconnect_push_supplier (TAO_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 eb40fe10eda..c09ae40a254 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h @@ -35,20 +35,20 @@ public: ECFS_Loopback_Supplier (CORBA::Long experiment_id); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_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 0344c4c2c00..744aa2d2acf 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp @@ -32,74 +32,74 @@ ECFS_Peer::~ECFS_Peer (void) } void -ECFS_Peer::init (PortableServer::POA_ptr root_poa, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Peer::init (PortableServer::POA_ptr root_poa + TAO_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 (ACE_TRY_ENV); + ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; this->event_channel_ = - ec_impl->_this (ACE_TRY_ENV); + ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventChannelAdmin::EventChannel_ptr -ECFS_Peer::channel (CORBA::Environment &) +ECFS_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)) { return RtecEventChannelAdmin::EventChannel::_duplicate (this->event_channel_.in ()); } void -ECFS_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec + TAO_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 (), - ACE_TRY_ENV); + this->event_channel_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_var observer = - gateway->_this (ACE_TRY_ENV); + gateway->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::Observer_Handle h = - this->event_channel_->append_observer (observer.in (), - ACE_TRY_ENV); + this->event_channel_->append_observer (observer.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK; gateway->observer_handle (h); } Control::Loopback_ptr -ECFS_Peer::setup_loopback (CORBA::Long experiment_id, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Peer::setup_loopback (CORBA::Long experiment_id + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<ECFS_Loopback> loopback (new ECFS_Loopback); loopback->init (experiment_id, - this->event_channel_.in (), - ACE_TRY_ENV); + this->event_channel_.in () + TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (Control::Loopback::_nil ()); - return loopback->_this (ACE_TRY_ENV); + return loopback->_this (TAO_ENV_SINGLE_ARG_PARAMETER); } Control::Samples * ECFS_Peer::run_experiment (CORBA::Long consumer_count, CORBA::Long experiment_id, CORBA::Long iterations, - CORBA::Long_out gsf, - CORBA::Environment &ACE_TRY_ENV) + CORBA::Long_out gsf + TAO_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 (), ACE_TRY_ENV); + consumer[i]->connect (this->event_channel_.in () TAO_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 (), ACE_TRY_ENV); + supplier->connect (this->event_channel_.in () TAO_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, ACE_TRY_ENV); + supplier->push (event TAO_ENV_ARG_PARAMETER); ACE_CHECK_RETURN (0); } - supplier->disconnect (ACE_TRY_ENV); + supplier->disconnect (TAO_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 (ACE_TRY_ENV); + consumer[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK_RETURN (0); } @@ -172,13 +172,13 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count, } void -ECFS_Peer::shutdown (CORBA::Environment &ACE_TRY_ENV) +ECFS_Peer::shutdown (TAO_ENV_SINGLE_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)) { - this->event_channel_->destroy (ACE_TRY_ENV); + this->event_channel_->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - this->orb_->shutdown (0, ACE_TRY_ENV); + this->orb_->shutdown (0 TAO_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 7efdc6bd39d..e5c1d1cf133 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h @@ -32,32 +32,32 @@ public: virtual ~ECFS_Peer (void); /// Initialize the peer - void init (PortableServer::POA_ptr poa, - CORBA::Environment &ACE_TRY_ENV); + void init (PortableServer::POA_ptr poa + TAO_ENV_ARG_DECL); //@{ /** @name The Control::Peer methods */ virtual RtecEventChannelAdmin::EventChannel_ptr - channel (CORBA::Environment&) + channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec, - CORBA::Environment&) + virtual void connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id, - CORBA::Environment &) + Control::Loopback_ptr setup_loopback (CORBA::Long experiment_id + TAO_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, - CORBA::Environment &) + CORBA::Long_out gsf + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void shutdown (CORBA::Environment&) + virtual void shutdown (TAO_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 d5ca3e9d36a..7e01fd080ab 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 (ACE_TRY_ENV); + this->ptr_->_remove_ref (TAO_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 08cc54f957e..1c8552ab74a 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp @@ -17,11 +17,11 @@ ECFS_Supplier::ECFS_Supplier (CORBA::Long experiment_id) } void -ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_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 (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -47,13 +47,13 @@ ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, sh0.source = this->experiment_id_; this->proxy_consumer_->connect_push_supplier (supplier.in (), - supplier_qos, - ACE_TRY_ENV); + supplier_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECFS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -65,23 +65,23 @@ ECFS_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECFS_Supplier::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +ECFS_Supplier::push (const RtecEventComm::EventSet &events + TAO_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, ACE_TRY_ENV); + proxy->push (events TAO_ENV_ARG_PARAMETER); } void -ECFS_Supplier::disconnect_push_supplier (CORBA::Environment &) +ECFS_Supplier::disconnect_push_supplier (TAO_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 171b4ec715f..83349929b40 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h @@ -35,20 +35,20 @@ public: ECFS_Supplier (CORBA::Long experiment_id); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_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 870ca870754..3a068ab08cb 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp @@ -73,7 +73,7 @@ int main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -81,12 +81,12 @@ int main (int argc, char *argv[]) // Get the event channel object reference CORBA::Object_var coordinator_object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; Control::Coordinator_var coordinator = - Control::Coordinator::_narrow (coordinator_object.in (), - ACE_TRY_ENV); + Control::Coordinator::_narrow (coordinator_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (coordinator.in ())) @@ -97,13 +97,13 @@ int main (int argc, char *argv[]) } CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -113,20 +113,20 @@ int main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -135,32 +135,32 @@ int main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Servant_var<ECFS_Peer> peer_impl (new ECFS_Peer (orb.in ())); - peer_impl->init (root_poa.in (), ACE_TRY_ENV); + peer_impl->init (root_poa.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - Control::Peer_var peer (peer_impl->_this (ACE_TRY_ENV)); + Control::Peer_var peer (peer_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER)); ACE_TRY_CHECK; - coordinator->join (peer.in (), ACE_TRY_ENV); + coordinator->join (peer.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_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 5f8dd6cacc7..a6aea7fa427 100644 --- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp @@ -95,20 +95,20 @@ int main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -118,20 +118,20 @@ int main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -140,10 +140,10 @@ int main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; Servant_var<ECFS_Coordinator> coordinator_impl ( @@ -155,11 +155,11 @@ int main (int argc, char *argv[]) ); Control::Coordinator_var coordinator = - coordinator_impl->_this (ACE_TRY_ENV); + coordinator_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (coordinator.in (), ACE_TRY_ENV); + orb->object_to_string (coordinator.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the ior to the <ior_output_file> @@ -172,18 +172,18 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_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 5a622f6bbdd..3b398172a15 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 (ACE_TRY_ENV); + this->orb_->run (TAO_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 96821914159..2e020bbd26f 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.cpp @@ -17,11 +17,11 @@ ECL_Consumer::ECL_Consumer (int iterations) } void -ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_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 (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -51,13 +51,13 @@ ECL_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, h1.source = ACE_ES_EVENT_SOURCE_ANY; this->proxy_supplier_->connect_push_consumer (consumer.in (), - consumer_qos, - ACE_TRY_ENV); + consumer_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECL_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECL_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -69,17 +69,17 @@ ECL_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -90,8 +90,8 @@ ECL_Consumer::sample_history (void) } void -ECL_Consumer::push (const RtecEventComm::EventSet &events, - CORBA::Environment &) +ECL_Consumer::push (const RtecEventComm::EventSet &events + TAO_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 (CORBA::Environment &) +ECL_Consumer::disconnect_push_consumer (TAO_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 b089e771fcb..a05566c370b 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Consumer.h @@ -32,11 +32,11 @@ public: ECL_Consumer (int iterations); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); /// Access the history of samples ACE_Sample_History &sample_history (void); @@ -44,10 +44,10 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_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 ebf23176603..1712c4f496c 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.cpp @@ -16,11 +16,11 @@ ECL_Supplier::ECL_Supplier (void) } void -ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_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 (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -45,13 +45,13 @@ ECL_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, sh0.source = 1; // first free event source this->proxy_consumer_->connect_push_supplier (supplier.in (), - supplier_qos, - ACE_TRY_ENV); + supplier_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECL_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECL_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -63,23 +63,23 @@ ECL_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECL_Supplier::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +ECL_Supplier::push (const RtecEventComm::EventSet &events + TAO_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, ACE_TRY_ENV); + proxy->push (events TAO_ENV_ARG_PARAMETER); } void -ECL_Supplier::disconnect_push_supplier (CORBA::Environment &) +ECL_Supplier::disconnect_push_supplier (TAO_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 85485f85335..e9e26a788bf 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Latency/Supplier.h @@ -30,20 +30,20 @@ public: ECL_Supplier (void); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_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 4ad39ad9b6c..ff418703646 100644 --- a/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp @@ -22,7 +22,10 @@ #include "ace/Sched_Params.h" #include "ace/Task.h" -ACE_RCSID(EC_Latency, client, "$Id$") +ACE_RCSID (EC_Latency, + client, + "$Id$") + const char *ior = "file://test.ior"; int iterations = 10000; @@ -57,17 +60,17 @@ main (int argc, char *argv []) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -77,16 +80,16 @@ main (int argc, char *argv []) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (poa_object.in ())) @@ -95,14 +98,14 @@ main (int argc, char *argv []) 1); PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) @@ -110,12 +113,12 @@ main (int argc, char *argv []) // Get the event channel object reference CORBA::Object_var ec_object = - orb->string_to_object (ior, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in (), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -130,7 +133,7 @@ main (int argc, char *argv []) 1); PortableServer::ServantBase_var consumer_owner (consumer_impl); - consumer_impl->connect (ec.in (), ACE_TRY_ENV); + consumer_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ECL_Supplier *supplier_impl; @@ -139,7 +142,7 @@ main (int argc, char *argv []) 1); PortableServer::ServantBase_var supplier_owner (supplier_impl); - supplier_impl->connect (ec.in (), ACE_TRY_ENV); + supplier_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n")); @@ -161,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, ACE_TRY_ENV); + supplier_impl->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_hrtime_t end = ACE_OS::gethrtime (); - consumer_impl->disconnect (ACE_TRY_ENV); + consumer_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - supplier_impl->disconnect (ACE_TRY_ENV); + supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Calibrate the high resolution timer *before* starting the @@ -195,12 +198,12 @@ main (int argc, char *argv []) stats.samples_count ()); - orb->shutdown (0, ACE_TRY_ENV); + orb->shutdown (0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_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 b01372dfc74..11b88dfa730 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, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -87,20 +87,20 @@ int main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_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 (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_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 (ACE_TRY_ENV); + ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - ec_impl->_this (ACE_TRY_ENV); + ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (ec.in (), ACE_TRY_ENV); + orb->object_to_string (ec.in () TAO_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 (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_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 a4ded501b6b..0237a86f190 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 (ACE_TRY_ENV); + this->orb_->run (TAO_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 6134b826bf8..788c0b061ca 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp @@ -17,11 +17,11 @@ ECS_Consumer::ECS_Consumer (int iterations) } void -ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = - ec->for_consumers (ACE_TRY_ENV); + ec->for_consumers (TAO_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 (ACE_TRY_ENV); + consumer_admin->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushConsumer_var consumer = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::ConsumerQOS consumer_qos; @@ -51,13 +51,13 @@ ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec, h1.source = ACE_ES_EVENT_SOURCE_ANY; this->proxy_supplier_->connect_push_consumer (consumer.in (), - consumer_qos, - ACE_TRY_ENV); + consumer_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECS_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushSupplier_var proxy; { @@ -69,17 +69,17 @@ ECS_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_supplier (ACE_TRY_ENV); + proxy->disconnect_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } @@ -90,8 +90,8 @@ ECS_Consumer::sample_history (void) } void -ECS_Consumer::push (const RtecEventComm::EventSet &events, - CORBA::Environment &) +ECS_Consumer::push (const RtecEventComm::EventSet &events + TAO_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 (CORBA::Environment &) +ECS_Consumer::disconnect_push_consumer (TAO_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 4bd7f38262e..8f1aee4416a 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h @@ -32,11 +32,11 @@ public: ECS_Consumer (int iterations); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); /// Access the history of samples ACE_Sample_History &sample_history (void); @@ -44,10 +44,10 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events, - CORBA::Environment &_env) + virtual void push (const RtecEventComm::EventSet& events + TAO_ENV_ARG_DECL) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (CORBA::Environment &) + virtual void disconnect_push_consumer (TAO_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 61ff20dc369..99dfd39610d 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp @@ -16,11 +16,11 @@ ECS_Supplier::ECS_Supplier (void) } void -ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV) +ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = - ec->for_suppliers (ACE_TRY_ENV); + ec->for_suppliers (TAO_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 (ACE_TRY_ENV); + supplier_admin->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; } RtecEventComm::PushSupplier_var supplier = - this->_this (ACE_TRY_ENV); + this->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; RtecEventChannelAdmin::SupplierQOS supplier_qos; @@ -45,13 +45,13 @@ ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec, sh0.source = 1; // first free event source this->proxy_consumer_->connect_push_supplier (supplier.in (), - supplier_qos, - ACE_TRY_ENV); + supplier_qos + TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECS_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) +ECS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL) { RtecEventChannelAdmin::ProxyPushConsumer_var proxy; { @@ -63,23 +63,23 @@ ECS_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV) ACE_TRY { - proxy->disconnect_push_consumer (ACE_TRY_ENV); + proxy->disconnect_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY {} ACE_ENDTRY; - PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV); + PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_CHECK; - PortableServer::ObjectId_var id = poa->servant_to_id (this, - ACE_TRY_ENV); + PortableServer::ObjectId_var id = poa->servant_to_id (this + TAO_ENV_ARG_PARAMETER); ACE_CHECK; - poa->deactivate_object (id.in (), ACE_TRY_ENV); + poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER); ACE_CHECK; } void -ECS_Supplier::push (const RtecEventComm::EventSet &events, - CORBA::Environment &ACE_TRY_ENV) +ECS_Supplier::push (const RtecEventComm::EventSet &events + TAO_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, ACE_TRY_ENV); + proxy->push (events TAO_ENV_ARG_PARAMETER); } void -ECS_Supplier::disconnect_push_supplier (CORBA::Environment &) +ECS_Supplier::disconnect_push_supplier (TAO_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 6e0fd8b780a..3feeb4460ab 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h @@ -32,20 +32,20 @@ public: ECS_Supplier (void); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec, - CORBA::Environment &ACE_TRY_ENV); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec + TAO_ENV_ARG_DECL); /// Disconnect from the event channel - void disconnect (CORBA::Environment &ACE_TRY_ENV); + void disconnect (TAO_ENV_SINGLE_ARG_DECL); - void push (const RtecEventComm::EventSet &events, - CORBA::Environment &) + void push (const RtecEventComm::EventSet &events + TAO_ENV_ARG_DECL_NOT_USED) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (CORBA::Environment &) + virtual void disconnect_push_supplier (TAO_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 c95f50fc5d0..9de742cb799 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, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -78,16 +78,16 @@ main (int argc, char *argv []) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_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 (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_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, ACE_TRY_ENV); + orb->string_to_object (ior TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in (), - ACE_TRY_ENV); + RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (ec.in ())) { @@ -129,13 +129,12 @@ main (int argc, char *argv []) ACE_NEW_RETURN (consumer_impl, ECS_Consumer*[consumer_count], 1); - int i; - for (i = 0; i != consumer_count; ++i) + for (int i = 0; i != consumer_count; ++i) { ACE_NEW_RETURN (consumer_impl[i], ECS_Consumer (iterations), 1); - consumer_impl[i]->connect (ec.in (), ACE_TRY_ENV); + consumer_impl[i]->connect (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } @@ -145,7 +144,7 @@ main (int argc, char *argv []) 1); PortableServer::ServantBase_var supplier_owner (supplier_impl); - supplier_impl->connect (ec.in (), ACE_TRY_ENV); + supplier_impl->connect (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "Connected consumer & supplier\n")); @@ -161,23 +160,23 @@ main (int argc, char *argv []) // event[0].data.payload.length(1024); ACE_hrtime_t start = ACE_OS::gethrtime (); - for (i = 0; i != iterations; ++i) + for (int i = 0; i != iterations; ++i) { ACE_hrtime_t creation = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); // push one event... - supplier_impl->push (event, ACE_TRY_ENV); + supplier_impl->push (event TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_hrtime_t end = ACE_OS::gethrtime (); - for (i = 0; i != consumer_count; ++i) + for (int i = 0; i != consumer_count; ++i) { - consumer_impl[i]->disconnect (ACE_TRY_ENV); + consumer_impl[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } - supplier_impl->disconnect (ACE_TRY_ENV); + supplier_impl->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; // Calibrate the high resolution timer *before* starting the @@ -189,7 +188,7 @@ main (int argc, char *argv []) ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf)); ACE_Sample_History history (iterations); - for (int j = 0; j != iterations; ++j) + for (size_t j = 0; j != iterations; ++j) { ACE_UINT64 value = 0; for (int i = 0; i != consumer_count; ++i) @@ -197,7 +196,7 @@ main (int argc, char *argv []) ACE_Sample_History &consumer_history = consumer_impl[i]->sample_history (); - ACE_UINT64 consumer_sample = + ACE_UINT32 consumer_sample = consumer_history.get_sample (j); if (consumer_sample > value) value = consumer_sample; @@ -219,12 +218,12 @@ main (int argc, char *argv []) stats.samples_count ()); - orb->shutdown (0, ACE_TRY_ENV); + orb->shutdown (0 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; ACE_Thread_Manager::instance ()->wait (); - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_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 9145637d711..71c4b344f84 100644 --- a/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp +++ b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp @@ -72,17 +72,17 @@ int main (int argc, char *argv[]) ACE_TRY_NEW_ENV { CORBA::ORB_var orb = - CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV); + CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var manager_object = - orb->resolve_initial_references ("ORBPolicyManager", - ACE_TRY_ENV); + orb->resolve_initial_references ("ORBPolicyManager" + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::PolicyManager_var policy_manager = - CORBA::PolicyManager::_narrow (manager_object.in (), - ACE_TRY_ENV); + CORBA::PolicyManager::_narrow (manager_object.in () + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Any sync_scope; @@ -92,20 +92,20 @@ int main (int argc, char *argv[]) policy_list.length (1); policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope, - ACE_TRY_ENV); + sync_scope + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; policy_manager->set_policy_overrides (policy_list, - CORBA::SET_OVERRIDE, - ACE_TRY_ENV); + CORBA::SET_OVERRIDE + TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::Object_var poa_object = - orb->resolve_initial_references("RootPOA", ACE_TRY_ENV); + orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; PortableServer::POA_var root_poa = - PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV); + PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; if (CORBA::is_nil (root_poa.in ())) @@ -114,13 +114,13 @@ int main (int argc, char *argv[]) 1); PortableServer::POAManager_var poa_manager = - root_poa->the_POAManager (ACE_TRY_ENV); + root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; if (parse_args (argc, argv) != 0) return 1; - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; TAO_EC_Event_Channel_Attributes attr (root_poa.in (), @@ -131,15 +131,15 @@ int main (int argc, char *argv[]) 1); PortableServer::ServantBase_var ec_owner (ec_impl); - ec_impl->activate (ACE_TRY_ENV); + ec_impl->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; RtecEventChannelAdmin::EventChannel_var ec = - ec_impl->_this (ACE_TRY_ENV); + ec_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; CORBA::String_var ior = - orb->object_to_string (ec.in (), ACE_TRY_ENV); + orb->object_to_string (ec.in () TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; // Output the ior to the <ior_output_file> @@ -152,18 +152,18 @@ int main (int argc, char *argv[]) ACE_OS::fprintf (output_file, "%s", ior.in ()); ACE_OS::fclose (output_file); - poa_manager->activate (ACE_TRY_ENV); + poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; - orb->run (ACE_TRY_ENV); + orb->run (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n")); - root_poa->destroy (1, 1, ACE_TRY_ENV); + root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER); ACE_TRY_CHECK; - orb->destroy (ACE_TRY_ENV); + orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER); ACE_TRY_CHECK; } ACE_CATCHANY |