diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/RTEvent/lib')
14 files changed, 20 insertions, 60 deletions
diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp index a89beb5367b..9045c8ee020 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.cpp @@ -92,7 +92,6 @@ Consumer::sample_history (void) void Consumer::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_hrtime_t now = ACE_OS::gethrtime (); @@ -116,7 +115,6 @@ Consumer::push (const RtecEventComm::EventSet &events) void Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->proxy_supplier_ = @@ -125,7 +123,6 @@ Consumer::disconnect_push_consumer (void) PortableServer::POA_ptr Consumer::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h index 4718601a084..c9109cc884c 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Consumer.h @@ -49,12 +49,9 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp index 89c0ed4b450..c8dedde7cff 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.cpp @@ -44,7 +44,6 @@ Control::~Control (void) void Control::join (Federated_Test::Peer_ptr peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); @@ -164,7 +163,6 @@ Control::join (Federated_Test::Peer_ptr peer) PortableServer::POA_ptr Control::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h index e5bc4eb52df..dd923f2e8bd 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Control.h @@ -38,11 +38,9 @@ public: //@{ /** @name The Federated_Test::Control methods */ - virtual void join (Federated_Test::Peer_ptr peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void join (Federated_Test::Peer_ptr peer); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp index 3039480f1f8..c97cc03f939 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.cpp @@ -30,7 +30,6 @@ Loopback::Loopback (CORBA::Long experiment_id, void Loopback::disconnect (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { Auto_Disconnect<Loopback_Pair> disconnect (&this->loopback_pair_); diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h index 5b21092466f..4507a1a5a88 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback.h @@ -35,8 +35,7 @@ public: //@{ /** @name The Federated_Test::Loopback methods */ - virtual void disconnect (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp index 14ca03140b0..2fd3d0911e3 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.cpp @@ -83,7 +83,6 @@ Loopback_Consumer::disconnect (void) void 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); @@ -91,7 +90,6 @@ Loopback_Consumer::push (const RtecEventComm::EventSet &events) void Loopback_Consumer::disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->proxy_supplier_ = @@ -100,7 +98,6 @@ Loopback_Consumer::disconnect_push_consumer (void) PortableServer::POA_ptr Loopback_Consumer::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h index 00295b762b7..4d7f1fd1ec9 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Consumer.h @@ -43,12 +43,9 @@ public: //@{ /** @name The RtecEventComm::PushConsumer methods */ - virtual void push (const RtecEventComm::EventSet& events) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual void disconnect_push_consumer (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void push (const RtecEventComm::EventSet& events); + virtual void disconnect_push_consumer (void); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp index a1750d26f21..02a00e848fa 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.cpp @@ -74,7 +74,6 @@ Loopback_Supplier::disconnect (void) void Loopback_Supplier::push (const RtecEventComm::EventSet &source) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Loopback_Supplier pushing\n")); RtecEventChannelAdmin::ProxyPushConsumer_var proxy; @@ -109,7 +108,6 @@ Loopback_Supplier::push (const RtecEventComm::EventSet &source) void Loopback_Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->proxy_consumer_ = @@ -118,7 +116,6 @@ Loopback_Supplier::disconnect_push_supplier (void) PortableServer::POA_ptr Loopback_Supplier::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h index 6c58a9d55f7..e89dc9a5007 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Loopback_Supplier.h @@ -42,16 +42,13 @@ public: /// Disconnect from the event channel void disconnect (void); - void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const RtecEventComm::EventSet &events); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp index c4bb55f0347..4ca0fac10f4 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.cpp @@ -50,7 +50,6 @@ Peer_Base::~Peer_Base (void) void Peer_Base::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { { EC_Destroyer ec_destroyer (this->event_channel_.in ()); @@ -63,14 +62,12 @@ Peer_Base::shutdown (void) CORBA::Object_ptr Peer_Base::channel (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::Object::_duplicate (this->event_channel_.in ()); } void Peer_Base::connect (Federated_Test::Peer_ptr remote_peer) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_DEBUG ((LM_DEBUG, "(%P|%t) Connecting....\n")); CORBA::Object_var remote_ec_object = @@ -95,7 +92,6 @@ Peer_Base::connect (Federated_Test::Peer_ptr remote_peer) Federated_Test::Loopback_ptr Peer_Base::setup_loopback (CORBA::Long experiment_id, CORBA::Long base_event_type) - ACE_THROW_SPEC ((CORBA::SystemException)) { Servant_var<Loopback> loopback ( new Loopback (experiment_id, @@ -116,7 +112,6 @@ Peer_Base::setup_loopback (CORBA::Long experiment_id, PortableServer::POA_ptr Peer_Base::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h index caecbbfefa9..cea199e28c0 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Peer_Base.h @@ -40,22 +40,17 @@ public: //@{ /** @name The Federated_Test::Peer methods */ - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); virtual CORBA::Object_ptr - channel (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + channel (void); - virtual void connect (Federated_Test::Peer_ptr remote_peer) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void connect (Federated_Test::Peer_ptr remote_peer); Federated_Test::Loopback_ptr setup_loopback (CORBA::Long experiment_id, - CORBA::Long base_event_type) - ACE_THROW_SPEC ((CORBA::SystemException)); + CORBA::Long base_event_type); - PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableServer::POA_ptr _default_POA (void); //@} protected: diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp index 014ad19a0cc..4763b3abcd1 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.cpp @@ -79,7 +79,6 @@ Supplier::disconnect (void) void Supplier::push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)) { // ACE_DEBUG ((LM_DEBUG, "Supplier pushing (%d,%d)\n", // events[0].header.type, events[0].header.source)); @@ -96,7 +95,6 @@ Supplier::push (const RtecEventComm::EventSet &events) void Supplier::disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_GUARD (TAO_SYNCH_MUTEX, ace_mon, this->mutex_); this->proxy_consumer_ = @@ -105,7 +103,6 @@ Supplier::disconnect_push_supplier (void) PortableServer::POA_ptr Supplier::_default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return PortableServer::POA::_duplicate (this->default_POA_.in ()); } diff --git a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h index b164fd51e46..ebb88581e01 100644 --- a/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h +++ b/TAO/orbsvcs/performance-tests/RTEvent/lib/Supplier.h @@ -43,16 +43,13 @@ public: /// Disconnect from the event channel void disconnect (void); - void push (const RtecEventComm::EventSet &events) - ACE_THROW_SPEC ((CORBA::SystemException)); + void push (const RtecEventComm::EventSet &events); //@{ /** @name The RtecEventComm::PushSupplier methods */ - virtual void disconnect_push_supplier (void) - ACE_THROW_SPEC ((CORBA::SystemException)); - virtual PortableServer::POA_ptr _default_POA (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void disconnect_push_supplier (void); + virtual PortableServer::POA_ptr _default_POA (void); //@} private: |