diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/RTEvent/lib')
50 files changed, 172 insertions, 301 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl index e6da5c6d119..d45069fdf3d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Auto_Disconnect.inl @@ -10,13 +10,11 @@ template<class Client> ACE_INLINE void Disconnect<Client>::operator () (Client *client) { - ACE_DECLARE_NEW_ENV; - ACE_TRY + try { client->disconnect (); } - ACE_CATCHANY { }; - ACE_ENDTRY; + catch (const CORBA::Exception& ex){ }; } template<class Client> ACE_INLINE diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp index 5e7d3cfa0ac..402c9187779 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.cpp @@ -54,13 +54,12 @@ Client_Group::init (CORBA::Long experiment_id, } void -Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) +Client_Group::connect (RtecEventChannelAdmin::EventChannel_ptr ec) { - this->client_pair_.connect (ec ACE_ENV_ARG_PARAMETER); + this->client_pair_.connect (ec); Auto_Disconnect<Client_Pair> client_pair_disconnect (&this->client_pair_); - this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER); + this->loopback_pair_.connect (ec); Auto_Disconnect<Loopback_Pair> loopback_pair_disconnect (&this->loopback_pair_); loopback_pair_disconnect.release (); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h index 4b0dbb68bba..0f50a4bbc5a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Group.h @@ -71,8 +71,7 @@ public: PortableServer::POA_ptr consumer_poa); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec); /// Disconnect from the event channel void disconnect (void); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp index 8b1439975b2..d2c71bd2cb9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.cpp @@ -59,13 +59,12 @@ Client_Pair::init (CORBA::Long experiment_id, } void -Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) +Client_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec) { - this->supplier_->connect (ec ACE_ENV_ARG_PARAMETER); + this->supplier_->connect (ec); Auto_Disconnect<Supplier> supplier_disconnect (this->supplier_); - this->consumer_->connect (ec ACE_ENV_ARG_PARAMETER); + this->consumer_->connect (ec); Auto_Disconnect<Consumer> consumer_disconnect (this->consumer_); consumer_disconnect.release (); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h index e0bc5e5f195..d88d5fbff53 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Client_Pair.h @@ -74,8 +74,7 @@ public: PortableServer::POA_ptr consumer_poa); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec); /// Disconnect from the event channel void disconnect (void); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp index 20c01a4f80b..a89beb5367b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp @@ -31,8 +31,7 @@ Consumer::Consumer (CORBA::Long experiment_id, } void -Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) +Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = ec->for_consumers (); @@ -63,8 +62,7 @@ Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec h1.source = this->experiment_id_; this->proxy_supplier_->connect_push_consumer (consumer.in (), - consumer_qos - ACE_ENV_ARG_PARAMETER); + consumer_qos); } void @@ -78,13 +76,12 @@ Consumer::disconnect (void) proxy = this->proxy_supplier_._retn (); } - Implicit_Deactivator deactivator (this - ACE_ENV_ARG_PARAMETER); + Implicit_Deactivator deactivator (this); - ACE_TRY { + try{ proxy->disconnect_push_supplier (); - } ACE_CATCHANY { - } ACE_ENDTRY; + } catch (const CORBA::Exception&) { + } } ACE_Sample_History & @@ -94,8 +91,7 @@ Consumer::sample_history (void) } void -Consumer::push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL_NOT_USED) +Consumer::push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t now = ACE_OS::gethrtime (); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h index 516936d79dc..4718601a084 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h @@ -38,8 +38,7 @@ public: PortableServer::POA_ptr poa); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec); /// Disconnect from the event channel void disconnect (void); @@ -50,8 +49,7 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index c52cf21cd5b..89c0ed4b450 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -43,8 +43,7 @@ Control::~Control (void) } void -Control::join (Federated_Test::Peer_ptr peer - ACE_ENV_ARG_DECL) +Control::join (Federated_Test::Peer_ptr peer) ACE_THROW_SPEC ((CORBA::SystemException)) { { @@ -84,8 +83,7 @@ Control::join (Federated_Test::Peer_ptr peer { if (i != j) { - this->peers_[j]->connect (this->peers_[i].in () - ACE_ENV_ARG_PARAMETER); + this->peers_[j]->connect (this->peers_[i].in ()); } } } @@ -119,8 +117,7 @@ Control::join (Federated_Test::Peer_ptr peer { loopbacks[lcount] = this->peers_[j]->setup_loopback (experiment_id, - base_event_type - ACE_ENV_ARG_PARAMETER); + base_event_type); ACE_AUTO_PTR_RESET (disconnects[lcount], new Loopback_Disconnect ( @@ -131,8 +128,7 @@ Control::join (Federated_Test::Peer_ptr peer loopbacks[lcount] = this->peers_[j]->setup_loopback (experiment_id, - base_event_type + 2 - ACE_ENV_ARG_PARAMETER); + base_event_type + 2); ACE_AUTO_PTR_RESET (disconnects[lcount], new Loopback_Disconnect ( @@ -145,8 +141,7 @@ Control::join (Federated_Test::Peer_ptr peer Federated_Test::Experiment_Results_var results = this->peers_[i]->run_experiment (experiment_id, - this->iterations_ - ACE_ENV_ARG_PARAMETER); + this->iterations_); ACE_Sample_History history (results->length ()); for (CORBA::ULong k = 0; k != results->length (); ++k) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h index 4b1428e802c..e5bc4eb52df 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h @@ -38,8 +38,7 @@ public: //@{ /** @name The Federated_Test::Control methods */ - virtual void join (Federated_Test::Peer_ptr peer - ACE_ENV_ARG_DECL) + virtual void join (Federated_Test::Peer_ptr peer) ACE_THROW_SPEC ((CORBA::SystemException)); virtual PortableServer::POA_ptr _default_POA (void) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp index 1142519068c..6657f5294fd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/EC_Destroyer.cpp @@ -23,11 +23,10 @@ EC_Destroyer::EC_Destroyer (RtecEventChannelAdmin::EventChannel_ptr ec) EC_Destroyer::~EC_Destroyer (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY { + try{ this->ec_->destroy (); - } ACE_CATCH (CORBA::Exception, ex) { + } catch (const CORBA::Exception&) { // @@ TODO Log this event, check the Servant_var.cpp comments for // details. - } ACE_ENDTRY; + } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp index b559160c34a..eede6b8f2fe 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.cpp @@ -15,14 +15,13 @@ #include "Implicit_Deactivator.inl" #endif /* __ACE_INLINE__ */ -Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant - ACE_ENV_ARG_DECL) +Implicit_Deactivator::Implicit_Deactivator (PortableServer::Servant servant) { this->poa_ = servant->_default_POA (); this->id_ = - this->poa_->servant_to_id (servant ACE_ENV_ARG_PARAMETER); + this->poa_->servant_to_id (servant); } Implicit_Deactivator::Implicit_Deactivator (Implicit_Deactivator &rhs) @@ -48,15 +47,13 @@ Implicit_Deactivator::~Implicit_Deactivator () if (this->id_.ptr () == 0) return; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY { - this->poa_->deactivate_object (this->id_.in () - ACE_ENV_ARG_PARAMETER); - } ACE_CATCHANY { + try{ + this->poa_->deactivate_object (this->id_.in ()); + } catch (const CORBA::Exception&) { // @@ TODO This event should be logged. Cannot throw because that // would make it impossible to use this class effectively. // Read Servant_var.cpp for more details. - } ACE_ENDTRY; + } } Implicit_Deactivator& diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h index d7140a3275c..90fcc23b08e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Implicit_Deactivator.h @@ -23,8 +23,7 @@ public: /** * @param client The client */ - explicit Implicit_Deactivator (PortableServer::Servant servant = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + explicit Implicit_Deactivator (PortableServer::Servant servant = 0); Implicit_Deactivator (Implicit_Deactivator& rhs); Implicit_Deactivator& operator= (Implicit_Deactivator& rhs); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp index 04c666bc7c5..3039480f1f8 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp @@ -18,15 +18,14 @@ Loopback::Loopback (CORBA::Long experiment_id, CORBA::Long base_event_type, PortableServer::POA_ptr supplier_poa, PortableServer::POA_ptr consumer_poa, - RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) + RtecEventChannelAdmin::EventChannel_ptr ec) { this->loopback_pair_.init (experiment_id, base_event_type, supplier_poa, consumer_poa); - this->loopback_pair_.connect (ec ACE_ENV_ARG_PARAMETER); + this->loopback_pair_.connect (ec); } void @@ -35,5 +34,5 @@ Loopback::disconnect (void) { Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_); - Implicit_Deactivator deactivator (this ACE_ENV_ARG_PARAMETER); + Implicit_Deactivator deactivator (this); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h index 05919f2145d..5b21092466f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h @@ -30,8 +30,7 @@ public: CORBA::Long base_event_type, PortableServer::POA_ptr supplier_poa, PortableServer::POA_ptr consumer_poa, - RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + RtecEventChannelAdmin::EventChannel_ptr ec); //@{ /** @name The Federated_Test::Loopback methods diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index c5ec117f31f..abb7b7b3b2c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -27,8 +27,7 @@ Loopback_Consumer (CORBA::Long experiment_id, } void -Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) +Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec) { RtecEventChannelAdmin::ConsumerAdmin_var consumer_admin = ec->for_consumers (); @@ -59,8 +58,7 @@ Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec h1.type = this->event_type_; this->proxy_supplier_->connect_push_consumer (consumer.in (), - consumer_qos - ACE_ENV_ARG_PARAMETER); + consumer_qos); } void @@ -74,23 +72,21 @@ Loopback_Consumer::disconnect (void) proxy = this->proxy_supplier_._retn (); } - Implicit_Deactivator deactivator (this - ACE_ENV_ARG_PARAMETER); + Implicit_Deactivator deactivator (this); - ACE_TRY + try { proxy->disconnect_push_supplier (); } - ACE_CATCHANY {} ACE_ENDTRY; + catch (const CORBA::Exception& ex){} } void -Loopback_Consumer::push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL) +Loopback_Consumer::push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Consumer::push (%P|%t)\n")); - this->supplier_->push (events ACE_ENV_ARG_PARAMETER); + this->supplier_->push (events); } void diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index d35c8e79453..00295b762b7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -35,8 +35,7 @@ public: PortableServer::POA_ptr poa); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec); /// Disconnect from the event channel void disconnect (void); @@ -44,8 +43,7 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events - ACE_ENV_ARG_DECL) + virtual void push (const RtecEventComm::EventSet& events) ACE_THROW_SPEC ((CORBA::SystemException)); virtual void disconnect_push_consumer (void) ACE_THROW_SPEC ((CORBA::SystemException)); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp index a68ac6883ce..cde25535480 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.cpp @@ -33,13 +33,12 @@ Loopback_Pair::init (CORBA::Long experiment_id, } void -Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) +Loopback_Pair::connect (RtecEventChannelAdmin::EventChannel_ptr ec) { - this->loopback_supplier_->connect (ec ACE_ENV_ARG_PARAMETER); + this->loopback_supplier_->connect (ec); Auto_Disconnect<Loopback_Supplier> loopback_supplier_disconnect (this->loopback_supplier_); - this->loopback_consumer_->connect (ec ACE_ENV_ARG_PARAMETER); + this->loopback_consumer_->connect (ec); Auto_Disconnect<Loopback_Consumer> loopback_consumer_disconnect (this->loopback_consumer_); loopback_consumer_disconnect.release (); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h index ba586aa44c9..cb59f6178ba 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Pair.h @@ -53,8 +53,7 @@ public: PortableServer::POA_ptr consumer_poa); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec); /// Disconnect from the event channel void disconnect (void); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp index b16ae72c2a5..a1750d26f21 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp @@ -24,8 +24,7 @@ Loopback_Supplier::Loopback_Supplier (CORBA::Long experiment_id, } void -Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) +Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = ec->for_suppliers (); @@ -51,8 +50,7 @@ Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec sh0.source = this->experiment_id_; this->proxy_consumer_->connect_push_supplier (supplier.in (), - supplier_qos - ACE_ENV_ARG_PARAMETER); + supplier_qos); } void @@ -66,18 +64,16 @@ Loopback_Supplier::disconnect (void) proxy = this->proxy_consumer_._retn (); } - Implicit_Deactivator deactivator (this - ACE_ENV_ARG_PARAMETER); + Implicit_Deactivator deactivator (this); - ACE_TRY { + try{ proxy->disconnect_push_consumer (); - } ACE_CATCHANY { - } ACE_ENDTRY; + } catch (const CORBA::Exception&) { + } } void -Loopback_Supplier::push (const RtecEventComm::EventSet &source - ACE_ENV_ARG_DECL) +Loopback_Supplier::push (const RtecEventComm::EventSet &source) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Supplier pushing\n")); @@ -108,7 +104,7 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source events[i].header.source = this->experiment_id_; } - proxy->push (events ACE_ENV_ARG_PARAMETER); + proxy->push (events); } void diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h index 3611bf805ba..6c58a9d55f7 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h @@ -37,14 +37,12 @@ public: PortableServer::POA_ptr poa); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec); /// Disconnect from the event channel void disconnect (void); - void push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL_NOT_USED) + void push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp index 234764d7780..4ca093c4c0d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.cpp @@ -29,8 +29,7 @@ Low_Priority_Setup (int consumer_count, PortableServer::POA_ptr supplier_poa, PortableServer::POA_ptr consumer_poa, RtecEventChannelAdmin::EventChannel_ptr ec, - ACE_Barrier *barrier - ACE_ENV_ARG_DECL) + ACE_Barrier *barrier) : consumer_count_ (consumer_count) , clients_ (consumer_count ? new Client_Type[consumer_count] : 0) , disconnect_ (consumer_count ? new Client_Auto_Disconnect[consumer_count] : 0) @@ -57,8 +56,7 @@ Low_Priority_Setup (int consumer_count, gsf, supplier_poa, consumer_poa); - this->clients_[i].connect (ec - ACE_ENV_ARG_PARAMETER); + this->clients_[i].connect (ec); // Automatically disconnect the group if the connection was // successful this->disconnect_[i] = &this->clients_[i]; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h index e6f5315abd0..eed759944c3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Low_Priority_Setup.h @@ -49,8 +49,7 @@ public: PortableServer::POA_ptr supplier_poa, PortableServer::POA_ptr consumer_poa, RtecEventChannelAdmin::EventChannel_ptr ec, - ACE_Barrier *barrier - ACE_ENV_ARG_DECL); + ACE_Barrier *barrier); /// Stop all running threads void stop_all_threads (void); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp index 1c546280710..65c80374a6b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.cpp @@ -17,20 +17,17 @@ ACE_RCSID (TAO_PERF_RTEC, "$Id$") ORB_Holder::ORB_Holder (int &argc, char *argv[], - const char *orb_id - ACE_ENV_ARG_DECL) - : orb_ (CORBA::ORB_init (argc, argv, orb_id - ACE_ENV_ARG_PARAMETER)) + const char *orb_id) + : orb_ (CORBA::ORB_init (argc, argv, orb_id)) { } ORB_Holder::~ORB_Holder (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY { + try{ this->orb_->destroy (); - } ACE_CATCH (CORBA::Exception, ex) { + } catch (const CORBA::Exception&) { // @@ TODO Log this event, check the Servant_var.cpp comments for // details. - } ACE_ENDTRY; + } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h index a600f780980..fd3fc10c0f4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Holder.h @@ -27,8 +27,7 @@ class TAO_RTEC_Perf_Export ORB_Holder public: /// Constructor ORB_Holder (int &argc, char *argv[], - const char *orb_id = 0 - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + const char *orb_id = 0); /// Destructor /** diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl index 50b1d374110..ebdebfbd61a 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Shutdown.inl @@ -11,12 +11,9 @@ ACE_INLINE void ORB_Shutdown::operator () (CORBA::ORB_ptr orb) { - ACE_DECLARE_NEW_ENV; - ACE_TRY + try { - orb->shutdown (0 - ACE_ENV_ARG_PARAMETER); + orb->shutdown (0); } - ACE_CATCHANY { }; - ACE_ENDTRY; + catch (const CORBA::Exception& ex){ }; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp index ce73357a916..85fcf3b641e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task.cpp @@ -24,15 +24,13 @@ ORB_Task::ORB_Task (CORBA::ORB_ptr orb) int ORB_Task::svc (void) { - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY + try { this->orb_->run (); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { return -1; } - ACE_ENDTRY; return 0; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp index 5eb74cd2775..d4e996064cd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/ORB_Task_Activator.cpp @@ -20,9 +20,8 @@ ORB_Task_Activator::~ORB_Task_Activator (void) { if (this->task_ == 0) return; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY { - (*this->task_)->shutdown (0 ACE_ENV_ARG_PARAMETER); - } ACE_CATCHANY { - } ACE_ENDTRY; + try{ + (*this->task_)->shutdown (0); + } catch (const CORBA::Exception&) { + } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index aa7265da3ff..c4bb55f0347 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -23,30 +23,25 @@ ACE_RCSID (TAO_RTEC_Perf, "$Id$") Peer_Base::Peer_Base (CORBA::ORB_ptr orb, - RTServer_Setup &rtserver_setup - ACE_ENV_ARG_DECL) + RTServer_Setup &rtserver_setup) : orb_ (CORBA::ORB::_duplicate (orb)) , poa_ (rtserver_setup.poa ()) { Servant_var<TAO_EC_Event_Channel> ec_impl ( RTEC_Initializer::create (this->poa_.in (), this->poa_.in (), - rtserver_setup.rtcorba_setup () - ACE_ENV_ARG_PARAMETER) + rtserver_setup.rtcorba_setup ()) ); ec_impl->activate (); PortableServer::ObjectId_var ec_id = - this->poa_->activate_object (ec_impl.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->activate_object (ec_impl.in ()); CORBA::Object_var ec_object = - this->poa_->id_to_reference (ec_id.in () - ACE_ENV_ARG_PARAMETER); + this->poa_->id_to_reference (ec_id.in ()); this->event_channel_ = - RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in () - ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (ec_object.in ()); } Peer_Base::~Peer_Base (void) @@ -63,7 +58,7 @@ Peer_Base::shutdown (void) RtecEventChannelAdmin::EventChannel::_nil (); } - this->orb_->shutdown (0 ACE_ENV_ARG_PARAMETER); + this->orb_->shutdown (0); } CORBA::Object_ptr @@ -74,8 +69,7 @@ Peer_Base::channel (void) } void -Peer_Base::connect (Federated_Test::Peer_ptr remote_peer - ACE_ENV_ARG_DECL) +Peer_Base::connect (Federated_Test::Peer_ptr remote_peer) ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n")); @@ -83,28 +77,24 @@ Peer_Base::connect (Federated_Test::Peer_ptr remote_peer remote_peer->channel (); RtecEventChannelAdmin::EventChannel_var remote_ec = - RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in () - ACE_ENV_ARG_PARAMETER); + RtecEventChannelAdmin::EventChannel::_narrow (remote_ec_object.in ()); Servant_var<TAO_EC_Gateway_IIOP> gateway (new TAO_EC_Gateway_IIOP); gateway->init (remote_ec.in (), - this->event_channel_.in () - ACE_ENV_ARG_PARAMETER); + this->event_channel_.in ()); RtecEventChannelAdmin::Observer_var observer = gateway->_this (); RtecEventChannelAdmin::Observer_Handle h = - this->event_channel_->append_observer (observer.in () - ACE_ENV_ARG_PARAMETER); + this->event_channel_->append_observer (observer.in ()); gateway->observer_handle (h); } Federated_Test::Loopback_ptr Peer_Base::setup_loopback (CORBA::Long experiment_id, - CORBA::Long base_event_type - ACE_ENV_ARG_DECL) + CORBA::Long base_event_type) ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<Loopback> loopback ( @@ -112,8 +102,7 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id, base_event_type, this->poa_.in (), this->poa_.in (), - this->event_channel_.in () - ACE_ENV_ARG_PARAMETER)); + this->event_channel_.in ())); Auto_Disconnect<Loopback> disconnect (loopback); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h index bc81d6c255a..caecbbfefa9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h @@ -32,8 +32,7 @@ class TAO_RTEC_Perf_Export Peer_Base public: /// Constructor Peer_Base (CORBA::ORB_ptr orb, - RTServer_Setup &rtserver_setup - ACE_ENV_ARG_DECL); + RTServer_Setup &rtserver_setup); /// Destructor virtual ~Peer_Base (void); @@ -48,13 +47,11 @@ public: channel (void) ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void connect (Federated_Test::Peer_ptr remote_peer - ACE_ENV_ARG_DECL_NOT_USED) + virtual void connect (Federated_Test::Peer_ptr remote_peer) ACE_THROW_SPEC ((CORBA::SystemException)); Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id, - CORBA::Long base_event_type - ACE_ENV_ARG_DECL_NOT_USED) + CORBA::Long base_event_type) ACE_THROW_SPEC ((CORBA::SystemException)); PortableServer::POA_ptr _default_POA (void) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp index 196ab2d93ac..a6c00e9751d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.cpp @@ -19,18 +19,15 @@ ACE_RCSID (TAO_PERF_RTEC, "$Id$") PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb, - const RTCORBA_Setup &rtcorba_setup - ACE_ENV_ARG_DECL) + const RTCORBA_Setup &rtcorba_setup) { CORBA::PolicyManager_var policy_manager = RIR_Narrow<CORBA::PolicyManager>::resolve (orb, - "ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + "ORBPolicyManager"); RTCORBA::RTORB_var rtorb = RIR_Narrow<RTCORBA::RTORB>::resolve (orb, - "RTORB" - ACE_ENV_ARG_PARAMETER); + "RTORB"); const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes (); @@ -44,11 +41,9 @@ PriorityBand_Setup::PriorityBand_Setup (CORBA::ORB_ptr orb, CORBA::PolicyList policy_list (1); policy_list.length (1); policy_list[0] = - rtorb->create_priority_banded_connection_policy (priority_bands - ACE_ENV_ARG_PARAMETER); + rtorb->create_priority_banded_connection_policy (priority_bands); policy_manager->set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policy_list[0]->destroy (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h index 33cebd601cf..30b7b0dac84 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/PriorityBand_Setup.h @@ -29,8 +29,7 @@ class TAO_RTEC_Perf_Export PriorityBand_Setup public: /// Constructor PriorityBand_Setup (CORBA::ORB_ptr orb, - const RTCORBA_Setup &rtcorba_setup - ACE_ENV_ARG_DECL); + const RTCORBA_Setup &rtcorba_setup); /// Destructor /** diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp index 57a0f32e6ff..165b1b1dc5d 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.cpp @@ -17,18 +17,16 @@ template<class Interface> ACE_TYPENAME RIR_Narrow<Interface>::Interface_ptr RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb, - const char *object_id - ACE_ENV_ARG_DECL) + const char *object_id) { Interface_var interface; - ACE_TRY + try { CORBA::Object_var object = - orb->resolve_initial_references (object_id - ACE_ENV_ARG_PARAMETER); + orb->resolve_initial_references (object_id); - interface = Interface::_narrow (object.in () ACE_ENV_ARG_PARAMETER); + interface = Interface::_narrow (object.in ()); if (CORBA::is_nil (interface.in ())) { @@ -37,10 +35,9 @@ RIR_Narrow<Interface>::resolve (CORBA::ORB_ptr orb, object_id)); ACE_OS::exit (1); } - }ACE_CATCHANY{ - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "Caught an exception \n"); + } catch (const CORBA::Exception& ex) { + ex._tao_print_exception ("Caught an exception \n"); } - ACE_ENDTRY; return interface._retn (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h index ae3d9351f7b..2e22caccb82 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RIR_Narrow.h @@ -28,8 +28,7 @@ public: typedef typename Interface::_var_type Interface_var; static Interface_ptr resolve (CORBA::ORB_ptr orb, - const char *object_id - ACE_ENV_ARG_DECL); + const char *object_id); }; #if defined (ACE_TEMPLATES_REQUIRE_SOURCE) diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp index 4b08ed77d4c..6c49ea4b684 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.cpp @@ -22,41 +22,34 @@ ACE_RCSID (TAO_PERF_RTEC, RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb, const RT_Class &rtclass, - int nthreads - ACE_ENV_ARG_DECL) + int nthreads) : lanes_ (3) { this->priority_mapping_manager_ = RIR_Narrow<RTCORBA::PriorityMappingManager>::resolve (orb, - "PriorityMappingManager" - ACE_ENV_ARG_PARAMETER); + "PriorityMappingManager"); this->priority_mapping_ = this->priority_mapping_manager_->mapping (); RTCORBA::Current_var current = RIR_Narrow<RTCORBA::Current>::resolve (orb, - "RTCurrent" - ACE_ENV_ARG_PARAMETER); + "RTCurrent"); RTCORBA::Priority corba_prc_priority; this->priority_mapping_->to_CORBA (rtclass.priority_process (), corba_prc_priority); - current->the_priority (corba_prc_priority - ACE_ENV_ARG_PARAMETER); + current->the_priority (corba_prc_priority); this->lanes_.length (3); this->setup_lane (rtclass.priority_high (), - this->lanes_[0] - ACE_ENV_ARG_PARAMETER); + this->lanes_[0]); this->setup_lane (rtclass.priority_process (), - this->lanes_[1] - ACE_ENV_ARG_PARAMETER); + this->lanes_[1]); this->setup_lane (rtclass.priority_low (), - this->lanes_[2] - ACE_ENV_ARG_PARAMETER); + this->lanes_[2]); this->lanes_[2].static_threads = nthreads; this->process_priority_ = this->lanes_[1].lane_priority; @@ -64,12 +57,11 @@ RTCORBA_Setup::RTCORBA_Setup (CORBA::ORB_ptr orb, void RTCORBA_Setup::setup_lane (int priority, - RTCORBA::ThreadpoolLane &lane - ACE_ENV_ARG_DECL) + RTCORBA::ThreadpoolLane &lane) { if (!this->priority_mapping_->to_CORBA (priority, lane.lane_priority)) - ACE_THROW (CORBA::BAD_PARAM ()); + throw CORBA::BAD_PARAM (); lane.static_threads = 1; lane.dynamic_threads = 0; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h index 96f7c487daf..b2d1744ea09 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTCORBA_Setup.h @@ -32,8 +32,7 @@ public: /// Constructor RTCORBA_Setup (CORBA::ORB_ptr orb, const RT_Class &rtclass, - int nthreads - ACE_ENV_ARG_DECL); + int nthreads); /// Return the thread pool lanes appropriate for the benchamrks const RTCORBA::ThreadpoolLanes & lanes (void) const; @@ -43,7 +42,7 @@ public: private: void setup_lane (int priority, RTCORBA::ThreadpoolLane &lane - ACE_ENV_ARG_DECL_WITH_DEFAULTS ); + ); private: RTCORBA::PriorityMappingManager_var priority_mapping_manager_; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp index e67964e0482..a9bc97712f4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.cpp @@ -23,10 +23,9 @@ ACE_RCSID (TAO_PERF_RTEC, RTClient_Setup::RTClient_Setup (int use_rt_corba, CORBA::ORB_ptr orb, const RT_Class &rt_class, - int nthreads - ACE_ENV_ARG_DECL) + int nthreads) : use_rt_corba_ (use_rt_corba) - , syncscope_setup_ (orb ACE_ENV_ARG_PARAMETER) + , syncscope_setup_ (orb) { if (use_rt_corba) @@ -34,16 +33,14 @@ RTClient_Setup::RTClient_Setup (int use_rt_corba, ACE_AUTO_PTR_RESET (this->rtcorba_setup_, new RTCORBA_Setup (orb, rt_class, - nthreads - ACE_ENV_ARG_PARAMETER), + nthreads), RTCORBA_Setup ); #if 0 ACE_AUTO_PTR_RESET (this->priorityband_setup_, new PriorityBand_Setup (orb, - *this->rtcorba_setup_ - ACE_ENV_ARG_PARAMETER), + *this->rtcorba_setup_), PriorityBand_Setup ); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h index 8bea1503961..8a979ba7641 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTClient_Setup.h @@ -34,8 +34,7 @@ public: RTClient_Setup (int use_rt_corba, CORBA::ORB_ptr orb, const RT_Class &rt_class, - int nthreads - ACE_ENV_ARG_DECL); + int nthreads); /// Return non-zero if RTCORBA is enabled int use_rt_corba (void) const; diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp index 408b52b3557..6b843e524bf 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.cpp @@ -15,15 +15,14 @@ #include "ace/Dynamic_Service.h" -ACE_RCSID (TAO_PERF_RTEC, - RTEC_Initializer, +ACE_RCSID (TAO_PERF_RTEC, + RTEC_Initializer, "$Id$") TAO_EC_Event_Channel * RTEC_Initializer::create (PortableServer::POA_ptr consumer_poa, PortableServer::POA_ptr supplier_poa, - RTCORBA_Setup * rtcorba_setup - ACE_ENV_ARG_DECL_NOT_USED) + RTCORBA_Setup * rtcorba_setup) { TAO_EC_Event_Channel_Attributes attr (consumer_poa, supplier_poa); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h index 64645bcbf18..e4cea937e39 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTEC_Initializer.h @@ -37,8 +37,7 @@ public: /// Return a new event channel static TAO_EC_Event_Channel *create (PortableServer::POA_ptr consumer_poa, PortableServer::POA_ptr supplier_poa, - RTCORBA_Setup *rtcorba_setup - ACE_ENV_ARG_DECL); + RTCORBA_Setup *rtcorba_setup); }; #endif /* TAO_PERF_RTEC_RTEC_INITIALIZER_H */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp index da8163160b6..985b07682cf 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.cpp @@ -22,18 +22,15 @@ ACE_RCSID (TAO_PERF_RTEC, "$Id$") RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, - const RTCORBA_Setup &rtcorba_setup - ACE_ENV_ARG_DECL) + const RTCORBA_Setup &rtcorba_setup) { RTPortableServer::POA_var root_poa = RIR_Narrow<RTPortableServer::POA>::resolve (orb, - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); RTCORBA::RTORB_var rtorb = RIR_Narrow<RTCORBA::RTORB>::resolve (orb, - "RTORB" - ACE_ENV_ARG_PARAMETER); + "RTORB"); const CORBA::ULong stacksize = 1024 * 1024; // 1 Mb const RTCORBA::ThreadpoolLanes &lanes = rtcorba_setup.lanes (); @@ -48,30 +45,25 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, allow_borrowing, allow_request_buffering, max_buffered_requests, - max_request_buffer_size - ACE_ENV_ARG_PARAMETER); + max_request_buffer_size); // @@ We need an 'auto_ptr for thread pools' here! CORBA::PolicyList policies (4); policies.length (4); policies[0] = rtorb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED, - rtcorba_setup.process_priority () - ACE_ENV_ARG_PARAMETER); + rtcorba_setup.process_priority ()); policies[1] = - root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID - ACE_ENV_ARG_PARAMETER); + root_poa->create_id_assignment_policy (PortableServer::SYSTEM_ID); policies[2] = - root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION - ACE_ENV_ARG_PARAMETER); + root_poa->create_implicit_activation_policy (PortableServer::IMPLICIT_ACTIVATION); #if 0 policies.length (3); #else policies[3] = - rtorb->create_threadpool_policy (pool_id - ACE_ENV_ARG_PARAMETER); + rtorb->create_threadpool_policy (pool_id); #endif /* 0 */ PortableServer::POAManager_var poa_manager = @@ -80,8 +72,7 @@ RTPOA_Setup::RTPOA_Setup (CORBA::ORB_ptr orb, this->poa_ = root_poa->create_POA ("RTEC_Perf", poa_manager.in (), - policies - ACE_ENV_ARG_PARAMETER); + policies); for (CORBA::ULong i = 0; i != policies.length (); ++i) { diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h index dc3d19f0054..c69fd19dd0f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTPOA_Setup.h @@ -29,8 +29,7 @@ class TAO_RTEC_Perf_Export RTPOA_Setup public: /// Constructor RTPOA_Setup (CORBA::ORB_ptr orb, - const RTCORBA_Setup &rtcorba_setup - ACE_ENV_ARG_DECL); + const RTCORBA_Setup &rtcorba_setup); PortableServer::POA_ptr poa (void); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp index 0bd232c2feb..1ea7d0eee78 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.cpp @@ -23,21 +23,18 @@ ACE_RCSID (TAO_PERF_RTEC, RTServer_Setup::RTServer_Setup (int use_rt_corba, CORBA::ORB_ptr orb, const RT_Class &rt_class, - int nthreads - ACE_ENV_ARG_DECL) + int nthreads) : RTClient_Setup (use_rt_corba, orb, rt_class, - nthreads - ACE_ENV_ARG_PARAMETER) + nthreads) { if (use_rt_corba) { ACE_AUTO_PTR_RESET (this->rtpoa_setup_, new RTPOA_Setup (orb, - *this->rtcorba_setup () - ACE_ENV_ARG_PARAMETER), + *this->rtcorba_setup ()), RTPOA_Setup ); @@ -48,7 +45,6 @@ RTServer_Setup::RTServer_Setup (int use_rt_corba, { this->poa_ = RIR_Narrow<RTPortableServer::POA>::resolve (orb, - "RootPOA" - ACE_ENV_ARG_PARAMETER); + "RootPOA"); } } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h index eecc21ec6f8..2974d97d4eb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/RTServer_Setup.h @@ -30,8 +30,7 @@ public: RTServer_Setup (int use_rt_corba, CORBA::ORB_ptr orb, const RT_Class &rt_class, - int nthreads - ACE_ENV_ARG_DECL); + int nthreads); /// Return the POA configured by the RTPOA_Setup PortableServer::POA_ptr poa (void); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp index 5c294a3bdb7..ef58db60e53 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Send_Task.cpp @@ -87,7 +87,6 @@ Send_Task::svc (void) event[0].header.source = this->event_source_; event[0].header.ttl = 1; - ACE_DECLARE_NEW_CORBA_ENV; for (int i = start_i; i != this->iterations_; ++i) { if ((i + 1) % 1000 == 0) @@ -111,17 +110,15 @@ Send_Task::svc (void) ACE_hrtime_t creation = ACE_OS::gethrtime (); ORBSVCS_Time::hrtime_to_TimeT (event[0].header.creation_time, creation); - ACE_TRY + try { // push one event... - this->supplier_->push (event ACE_ENV_ARG_PARAMETER); + this->supplier_->push (event); } - ACE_CATCHANY + catch (const CORBA::Exception& ex) { - ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, - "Caught exception:"); + ex._tao_print_exception ("Caught exception:"); } - ACE_ENDTRY; } ACE_DEBUG ((LM_DEBUG, "(%P|%t) - Thread finished\n")); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp index 0f5f58f6cd6..9bdb1f6391f 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Servant_var.cpp @@ -22,10 +22,9 @@ Servant_var<SERVANT>::~Servant_var () if (this->ptr_ == 0) return; - ACE_DECLARE_NEW_CORBA_ENV; - ACE_TRY { + try{ this->ptr_->_remove_ref (); - } ACE_CATCHANY { + } catch (const CORBA::Exception&) { // @@ TODO This event should be logged. Cannot throw because that // would make it impossible to use this class effectively. // @@ -51,7 +50,7 @@ Servant_var<SERVANT>::~Servant_var () // particular implementation, and provides a light-weight, // high-performance solution for applications that want to avoid // logging. - } ACE_ENDTRY; + } } #endif /* TAO_PERF_RTEC_SERVANT_VAR_CPP */ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl index 45b3b310c67..0674d4d85c3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Shutdown.inl @@ -9,11 +9,9 @@ template<class Client> ACE_INLINE void Shutdown<Client>::operator () (Client *client) { - ACE_DECLARE_NEW_ENV; - ACE_TRY + try { client->shutdown (); } - ACE_CATCHANY { }; - ACE_ENDTRY; + catch (const CORBA::Exception& ex){ }; } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp index 1964145efac..a88127b62bb 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp @@ -25,8 +25,7 @@ Supplier::Supplier (CORBA::Long experiment_id, } void -Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL) +Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec) { RtecEventChannelAdmin::SupplierAdmin_var supplier_admin = ec->for_suppliers (); @@ -55,8 +54,7 @@ Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec } this->proxy_consumer_->connect_push_supplier (supplier.in (), - supplier_qos - ACE_ENV_ARG_PARAMETER); + supplier_qos); } void @@ -70,19 +68,17 @@ Supplier::disconnect (void) proxy = this->proxy_consumer_._retn (); } - Implicit_Deactivator deactivator (this - ACE_ENV_ARG_PARAMETER); + Implicit_Deactivator deactivator (this); - ACE_TRY + try { proxy->disconnect_push_consumer (); } - ACE_CATCHANY {} ACE_ENDTRY; + catch (const CORBA::Exception& ex){} } void -Supplier::push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL) +Supplier::push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Supplier pushing (%d,%d)\n", @@ -95,7 +91,7 @@ Supplier::push (const RtecEventComm::EventSet &events proxy = this->proxy_consumer_; } - proxy->push (events ACE_ENV_ARG_PARAMETER); + proxy->push (events); } void diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h index 3dc90af4fc0..b164fd51e46 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h @@ -38,14 +38,12 @@ public: PortableServer::POA_ptr poa); /// Connect to the event channel - void connect (RtecEventChannelAdmin::EventChannel_ptr ec - ACE_ENV_ARG_DECL); + void connect (RtecEventChannelAdmin::EventChannel_ptr ec); /// Disconnect from the event channel void disconnect (void); - void push (const RtecEventComm::EventSet &events - ACE_ENV_ARG_DECL_NOT_USED) + void push (const RtecEventComm::EventSet &events) ACE_THROW_SPEC ((CORBA::SystemException)); //@{ diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp index ef94e88f1b4..7ef6f47af0b 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.cpp @@ -19,29 +19,23 @@ ACE_RCSID (TAO_PERF_RTEC, "$Id$") SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb, - Messaging::SyncScope value - ACE_ENV_ARG_DECL) + Messaging::SyncScope value) { - this->init (orb, value - ACE_ENV_ARG_PARAMETER); + this->init (orb, value); } -SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL) +SyncScope_Setup::SyncScope_Setup (CORBA::ORB_ptr orb) { - this->init (orb, Messaging::SYNC_WITH_TARGET - ACE_ENV_ARG_PARAMETER); + this->init (orb, Messaging::SYNC_WITH_TARGET); } void SyncScope_Setup::init (CORBA::ORB_ptr orb, - Messaging::SyncScope value - ACE_ENV_ARG_DECL) + Messaging::SyncScope value) { CORBA::PolicyManager_var policy_manager = RIR_Narrow<CORBA::PolicyManager>::resolve (orb, - "ORBPolicyManager" - ACE_ENV_ARG_PARAMETER); + "ORBPolicyManager"); CORBA::PolicyList policy_list (1); policy_list.length (1); @@ -53,11 +47,9 @@ SyncScope_Setup::init (CORBA::ORB_ptr orb, // destroy() method on each policy... policy_list[0] = orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE, - sync_scope - ACE_ENV_ARG_PARAMETER); + sync_scope); policy_manager->set_policy_overrides (policy_list, - CORBA::ADD_OVERRIDE - ACE_ENV_ARG_PARAMETER); + CORBA::ADD_OVERRIDE); policy_list[0]->destroy (); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h index 9de943cc419..8904acd140e 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/SyncScope_Setup.h @@ -26,12 +26,10 @@ class TAO_RTEC_Perf_Export SyncScope_Setup { public: /// Constructor - SyncScope_Setup (CORBA::ORB_ptr orb - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + SyncScope_Setup (CORBA::ORB_ptr orb); SyncScope_Setup (CORBA::ORB_ptr orb, - Messaging::SyncScope value - ACE_ENV_ARG_DECL_WITH_DEFAULTS); + Messaging::SyncScope value); /// Destructor /** @@ -42,8 +40,7 @@ public: private: /// Implement the shared code between both constructors void init (CORBA::ORB_ptr orb, - Messaging::SyncScope value - ACE_ENV_ARG_DECL); + Messaging::SyncScope value); }; #if defined(__ACE_INLINE__) |