diff options
Diffstat (limited to 'TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS')
8 files changed, 13 insertions, 47 deletions
diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp index ec190f3298c..5c189e8c0af 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.cpp @@ -19,14 +19,12 @@ ORBInitializer::ORBInitializer (void) void ORBInitializer::pre_init ( PortableInterceptor::ORBInitInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ORBInitializer::post_init ( PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)) { ACE_NEW_THROW_EX (this->interceptor_, ServerRequestInterceptor, diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h index 83734927f65..7ccd73b60f5 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ORBInitializer.h @@ -58,11 +58,9 @@ public: * interface. */ //@{ - virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void pre_init (PortableInterceptor::ORBInitInfo_ptr info); - virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} /// Return a reference to the LoadAlert object. diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp index a9ea95abd62..ac374cc840a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.cpp @@ -31,7 +31,6 @@ RPS_Monitor::~RPS_Monitor (void) CosLoadBalancing::Location * RPS_Monitor::the_location (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -47,7 +46,6 @@ RPS_Monitor::the_location (void) CosLoadBalancing::LoadList * RPS_Monitor::loads (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { const ACE_Time_Value current_time = ACE_OS::gettimeofday (); diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h index 821e3964021..7825b5e5e67 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/RPS_Monitor.h @@ -49,8 +49,7 @@ public: /** * The returned "Location" is a sequence of length 1. */ - virtual CosLoadBalancing::Location * the_location () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::Location * the_location (); /// Return the average CPU load at the location which this /// LoadMonitor resides. @@ -59,8 +58,7 @@ public: * equal to CosLoadBalancing::LoadAverage, and the average CPU * load. */ - virtual CosLoadBalancing::LoadList * loads () - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual CosLoadBalancing::LoadList * loads (); //@} diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp index 4c8cf73a5c2..abf3b4db251 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.cpp @@ -18,7 +18,6 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb) Test::Timestamp Roundtrip::test_method (Test::Timestamp send_time, Test::number cl_number) - ACE_THROW_SPEC ((CORBA::SystemException)) { if (cl_number % 2 == 0) @@ -34,7 +33,6 @@ Roundtrip::test_method (Test::Timestamp send_time, void Roundtrip::shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { this->orb_->shutdown (0); } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h index 70aec84ecc9..f91c83ac26a 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/Roundtrip.h @@ -23,11 +23,9 @@ public: // = The skeleton methods virtual Test::Timestamp test_method (Test::Timestamp send_time, - Test::number cl_number) - ACE_THROW_SPEC ((CORBA::SystemException)); + Test::number cl_number); - virtual void shutdown (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void shutdown (void); private: /// Use an ORB reference to conver strings to objects and shutdown diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp index b7d2ca0b5f9..fa7f88a1ce8 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.cpp @@ -15,22 +15,18 @@ ServerRequestInterceptor::~ServerRequestInterceptor (void) char * ServerRequestInterceptor::name (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { return CORBA::string_dup ("ServerRequestInterceptor"); } void ServerRequestInterceptor::destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::receive_request_service_contexts ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { ++this->request_count_; } @@ -38,31 +34,24 @@ ServerRequestInterceptor::receive_request_service_contexts ( void ServerRequestInterceptor::receive_request ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::send_reply ( PortableInterceptor::ServerRequestInfo_ptr /* ri */) - ACE_THROW_SPEC ((CORBA::SystemException)) { } void ServerRequestInterceptor::send_exception ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } void ServerRequestInterceptor::send_other ( PortableInterceptor::ServerRequestInfo_ptr) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)) { } diff --git a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h index 556a67570bf..2e3fe2247a5 100644 --- a/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h +++ b/TAO/orbsvcs/performance-tests/LoadBalancing/LBPerf/RPS/ServerRequestInterceptor.h @@ -60,35 +60,24 @@ public: * ServerRequestInterceptors. */ //@{ - virtual char * name (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual char * name (void); - virtual void destroy (void) - ACE_THROW_SPEC ((CORBA::SystemException)); + virtual void destroy (void); virtual void receive_request_service_contexts ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void receive_request ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_reply ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_exception ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); virtual void send_other ( - PortableInterceptor::ServerRequestInfo_ptr ri) - ACE_THROW_SPEC ((CORBA::SystemException, - PortableInterceptor::ForwardRequest)); + PortableInterceptor::ServerRequestInfo_ptr ri); //@} CORBA::Long request_count (void); |