diff options
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/LoadBalancing')
28 files changed, 54 insertions, 87 deletions
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp index cae9a5df6bf..184f5c13129 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Load_Average_Monitor.cpp @@ -51,12 +51,12 @@ TAO_LB_CPU_Load_Average_Monitor::TAO_LB_CPU_Load_Average_Monitor ( } } -TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor (void) +TAO_LB_CPU_Load_Average_Monitor::~TAO_LB_CPU_Load_Average_Monitor () { } CosLoadBalancing::Location * -TAO_LB_CPU_Load_Average_Monitor::the_location (void) +TAO_LB_CPU_Load_Average_Monitor::the_location () { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -71,7 +71,7 @@ TAO_LB_CPU_Load_Average_Monitor::the_location (void) } CosLoadBalancing::LoadList * -TAO_LB_CPU_Load_Average_Monitor::loads (void) +TAO_LB_CPU_Load_Average_Monitor::loads () { CORBA::Float load = 0; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp index 18568bc60e9..140d1fd5f2d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_CPU_Utilization_Monitor.cpp @@ -10,7 +10,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -double calc_cpu_loading (void) +double calc_cpu_loading () { static char buf[1024]; static unsigned long prev_idle = 0; @@ -100,12 +100,12 @@ TAO_LB_CPU_Utilization_Monitor::TAO_LB_CPU_Utilization_Monitor (const char * loc } } -TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor (void) +TAO_LB_CPU_Utilization_Monitor::~TAO_LB_CPU_Utilization_Monitor () { } CosLoadBalancing::Location * -TAO_LB_CPU_Utilization_Monitor::the_location (void) +TAO_LB_CPU_Utilization_Monitor::the_location () { CosLoadBalancing::Location * location; ACE_NEW_THROW_EX (location, @@ -120,7 +120,7 @@ TAO_LB_CPU_Utilization_Monitor::the_location (void) } CosLoadBalancing::LoadList * -TAO_LB_CPU_Utilization_Monitor::loads (void) +TAO_LB_CPU_Utilization_Monitor::loads () { CORBA::Float load = 0; diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp index e8b7ed58bdd..434337ec336 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.cpp @@ -13,13 +13,13 @@ TAO_LB_ClientComponent::init (int /* argc */, ACE_TCHAR * /* argv */[]) } int -TAO_LB_ClientComponent::fini (void) +TAO_LB_ClientComponent::fini () { return 0; } int -TAO_LB_ClientComponent::register_orb_initializer (void) +TAO_LB_ClientComponent::register_orb_initializer () { try { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h index 359b4d493df..e21f4aa30cc 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientComponent.h @@ -40,7 +40,6 @@ class TAO_LoadBalancing_Export TAO_LB_ClientComponent : public ACE_Service_Object { public: - /// Initializes object when dynamic linking occurs. virtual int init (int argc, ACE_TCHAR *argv[]); @@ -48,10 +47,8 @@ public: virtual int fini (void); protected: - /// Register the LB_ClientComponent's ORBInitializer. int register_orb_initializer (void); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h index 0d26d87475c..9ce2a887ac8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientORBInitializer.h @@ -46,7 +46,6 @@ class TAO_LB_ClientORBInitializer public virtual ::CORBA::LocalObject { public: - /** * @name PortableInterceptor::ORBInitializer Methods * @@ -58,7 +57,6 @@ public: virtual void post_init (PortableInterceptor::ORBInitInfo_ptr info); //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp index f0db0d42c80..60aff63da0d 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ClientRequestInterceptor.cpp @@ -10,7 +10,7 @@ TAO_LB_ClientRequestInterceptor::name () } void -TAO_LB_ClientRequestInterceptor::destroy (void) +TAO_LB_ClientRequestInterceptor::destroy () { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp index 0094a7f89cb..7346bc1e73e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Component.cpp @@ -84,7 +84,7 @@ TAO_LB_Component::init (int argc, ACE_TCHAR * argv[]) } int -TAO_LB_Component::fini (void) +TAO_LB_Component::fini () { return 0; } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp index cd1014d001f..daf9dfa2485 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.cpp @@ -26,13 +26,13 @@ TAO_LB_IORInterceptor::TAO_LB_IORInterceptor ( } char * -TAO_LB_IORInterceptor::name (void) +TAO_LB_IORInterceptor::name () { return CORBA::string_dup ("TAO_LB_IORInterceptor"); } void -TAO_LB_IORInterceptor::destroy (void) +TAO_LB_IORInterceptor::destroy () { // Force the LoadManager reference to be released since the ORB's // lifetime is tied to object reference lifetimes. @@ -101,7 +101,7 @@ TAO_LB_IORInterceptor::adapter_state_changed ( } void -TAO_LB_IORInterceptor::register_load_alert (void) +TAO_LB_IORInterceptor::register_load_alert () { { ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h index fe81e8323e5..a82d675db16 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_IORInterceptor.h @@ -51,7 +51,6 @@ class TAO_LB_IORInterceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO_LB_IORInterceptor (const CORBA::StringSeq & object_groups, const CORBA::StringSeq & repository_ids, @@ -92,12 +91,10 @@ public: //@} private: - /// Create and register the LoadAlert object with the LoadManager. void register_load_alert (void); private: - /// List of stringified object group references. const CORBA::StringSeq object_groups_; @@ -122,7 +119,6 @@ private: /// Synchronize access to the class state. TAO_SYNCH_MUTEX lock_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp index 7768d687e3f..91e605558eb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.cpp @@ -41,20 +41,20 @@ TAO_LB_LeastLoaded::TAO_LB_LeastLoaded (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded (void) +TAO_LB_LeastLoaded::~TAO_LB_LeastLoaded () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LeastLoaded::name (void) +TAO_LB_LeastLoaded::name () { return CORBA::string_dup ("LeastLoaded"); } CosLoadBalancing::Properties * -TAO_LB_LeastLoaded::get_properties (void) +TAO_LB_LeastLoaded::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -293,7 +293,7 @@ TAO_LB_LeastLoaded::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LeastLoaded::_default_POA (void) +TAO_LB_LeastLoaded::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h index cfac64f7c8f..9dd963d8549 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LeastLoaded.h @@ -75,7 +75,6 @@ class TAO_LB_LeastLoaded : public virtual POA_CosLoadBalancing::Strategy { public: - /// Constructor. TAO_LB_LeastLoaded (PortableServer::POA_ptr poa); @@ -107,14 +106,12 @@ public: //@} /// Returns the default POA for this servant. - virtual PortableServer::POA_ptr _default_POA ( - ); + virtual PortableServer::POA_ptr _default_POA (); /// Initialize the LeastLoaded instance with the given properties. void init (const PortableGroup::Properties & props); protected: - /// Destructor. ~TAO_LB_LeastLoaded (void); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp index dab05290bac..a1fccfa31cd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.cpp @@ -6,18 +6,18 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlert::TAO_LB_LoadAlert (void) +TAO_LB_LoadAlert::TAO_LB_LoadAlert () : alerted_ (0), lock_ () { } -TAO_LB_LoadAlert::~TAO_LB_LoadAlert (void) +TAO_LB_LoadAlert::~TAO_LB_LoadAlert () { } void -TAO_LB_LoadAlert::enable_alert (void) +TAO_LB_LoadAlert::enable_alert () { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); @@ -25,7 +25,7 @@ TAO_LB_LoadAlert::enable_alert (void) } void -TAO_LB_LoadAlert::disable_alert (void) +TAO_LB_LoadAlert::disable_alert () { ACE_GUARD (TAO_SYNCH_MUTEX, monitor, this->lock_); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h index a0c270e0946..035fdf21aeb 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert.h @@ -28,7 +28,6 @@ class TAO_LoadBalancing_Export TAO_LB_LoadAlert : public virtual POA_CosLoadBalancing::LoadAlert { public: - /// Constructor. TAO_LB_LoadAlert (void); @@ -62,14 +61,12 @@ public: virtual ~TAO_LB_LoadAlert (void); private: - /// Has this LoadAlert servant been alerted of a high load condition /// by the LoadManager? CORBA::Boolean alerted_; /// Lock used to synchronized access to the LoadAlert state. mutable TAO_SYNCH_MUTEX lock_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp index fbba4fb425c..d19c4b29ddf 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.cpp @@ -3,7 +3,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo (void) +TAO_LB_LoadAlertInfo::TAO_LB_LoadAlertInfo () : load_alert (), alerted (0) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h index 0aa3cb0004e..4dec5ef7044 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlertInfo.h @@ -42,7 +42,6 @@ struct TAO_LB_LoadAlertInfo /// True if the LoadAlert object has been alerted about a given load /// condition. False otherwise. CORBA::Boolean alerted; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp index 0492f39e912..7a55a8bf123 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.cpp @@ -4,12 +4,12 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler (void) +TAO_LB_LoadAlert_Handler::~TAO_LB_LoadAlert_Handler () { } void -TAO_LB_LoadAlert_Handler::enable_alert (void) +TAO_LB_LoadAlert_Handler::enable_alert () { } @@ -24,7 +24,7 @@ TAO_LB_LoadAlert_Handler::enable_alert_excep ( } void -TAO_LB_LoadAlert_Handler::disable_alert (void) +TAO_LB_LoadAlert_Handler::disable_alert () { } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h index 07ca4cfd154..a35561a416b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAlert_Handler.h @@ -40,23 +40,18 @@ class TAO_LB_LoadAlert_Handler : public virtual POA_CosLoadBalancing::AMI_LoadAlertHandler { public: - virtual void enable_alert (void); - virtual void enable_alert_excep ( - ::Messaging::ExceptionHolder *); + virtual void enable_alert_excep (::Messaging::ExceptionHolder *); virtual void disable_alert (void); - virtual void disable_alert_excep ( - ::Messaging::ExceptionHolder *); + virtual void disable_alert_excep (::Messaging::ExceptionHolder *); protected: - /// Protected destructor to enforce propery memory management /// through reference counting. ~TAO_LB_LoadAlert_Handler (void); - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 506b720ddb1..65b656bdee4 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -39,20 +39,20 @@ TAO_LB_LoadAverage::TAO_LB_LoadAverage (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LoadAverage::~TAO_LB_LoadAverage (void) +TAO_LB_LoadAverage::~TAO_LB_LoadAverage () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LoadAverage::name (void) +TAO_LB_LoadAverage::name () { return CORBA::string_dup ("LoadAverage"); } CosLoadBalancing::Properties * -TAO_LB_LoadAverage::get_properties (void) +TAO_LB_LoadAverage::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -320,7 +320,7 @@ TAO_LB_LoadAverage::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LoadAverage::_default_POA (void) +TAO_LB_LoadAverage::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp index 93b1d34637b..b5fb4e0a12f 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadManager.cpp @@ -66,7 +66,7 @@ TAO_LB_LoadManager::TAO_LB_LoadManager (int ping_timeout, // by whatever code instantiates this LoadManager. } -TAO_LB_LoadManager::~TAO_LB_LoadManager (void) +TAO_LB_LoadManager::~TAO_LB_LoadManager () { this->shutdown_ = true; this->validate_condition_.signal (); @@ -1162,7 +1162,7 @@ TAO_LB_LoadManager::make_strategy (const CosLoadBalancing::StrategyInfo * info) int -TAO_LB_LoadManager::svc (void) +TAO_LB_LoadManager::svc () { while (! this->shutdown_) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 506deccc859..3f09e937742 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -40,20 +40,20 @@ TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa) TAO_LB_Random::init (); } -TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum (void) +TAO_LB_LoadMinimum::~TAO_LB_LoadMinimum () { delete this->load_map_; delete this->lock_; } char * -TAO_LB_LoadMinimum::name (void) +TAO_LB_LoadMinimum::name () { return CORBA::string_dup ("LoadMinimum"); } CosLoadBalancing::Properties * -TAO_LB_LoadMinimum::get_properties (void) +TAO_LB_LoadMinimum::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -357,7 +357,7 @@ TAO_LB_LoadMinimum::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_LoadMinimum::_default_POA (void) +TAO_LB_LoadMinimum::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h index 16f8052feaa..a95028fa71e 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.h @@ -76,7 +76,6 @@ class TAO_LB_LoadMinimum : public virtual POA_CosLoadBalancing::Strategy { public: - /// Constructor. TAO_LB_LoadMinimum (PortableServer::POA_ptr poa); @@ -108,14 +107,12 @@ public: //@} /// Returns the default POA for this servant. - virtual PortableServer::POA_ptr _default_POA ( - ); + virtual PortableServer::POA_ptr _default_POA (); /// Initialize the LoadMinimum instance with the given properties. void init (const PortableGroup::Properties & props); protected: - /// Destructor. ~TAO_LB_LoadMinimum (void); @@ -142,7 +139,6 @@ protected: CORBA::Float & value); private: - /// This servant's default POA. PortableServer::POA_var poa_; @@ -173,7 +169,6 @@ private: CORBA::Float per_balance_load_; //@} - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp index 90fda5e5db8..31b974fd655 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ObjectReferenceFactory.cpp @@ -47,14 +47,14 @@ TAO_LB_ObjectReferenceFactory::TAO_LB_ObjectReferenceFactory ( } ::CORBA::ValueBase * -TAO_LB_ObjectReferenceFactory::_copy_value (void) +TAO_LB_ObjectReferenceFactory::_copy_value () { ::CORBA::ValueBase *ret_val= 0; // Not implimented return ret_val; } -TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory (void) +TAO_LB_ObjectReferenceFactory::~TAO_LB_ObjectReferenceFactory () { // No need to call CORBA::remove_ref() on this->old_orf_. It is a // "_var" object, meaning that will be done automatically. diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp index a84d6345130..6e44f3ce5d6 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Pull_Handler.cpp @@ -5,7 +5,7 @@ TAO_BEGIN_VERSIONED_NAMESPACE_DECL -TAO_LB_Pull_Handler::TAO_LB_Pull_Handler (void) +TAO_LB_Pull_Handler::TAO_LB_Pull_Handler () : monitor_map_ (0), load_manager_ (0) { diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp index 96dcc7c5f31..12dc31cc68b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_Random.cpp @@ -23,13 +23,13 @@ TAO_LB_Random::TAO_LB_Random (PortableServer::POA_ptr poa) } char * -TAO_LB_Random::name (void) +TAO_LB_Random::name () { return CORBA::string_dup ("Random"); } CosLoadBalancing::Properties * -TAO_LB_Random::get_properties (void) +TAO_LB_Random::get_properties () { CosLoadBalancing::Properties * props = 0; ACE_NEW_THROW_EX (props, @@ -85,7 +85,7 @@ TAO_LB_Random::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_Random::_default_POA (void) +TAO_LB_Random::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } @@ -133,7 +133,7 @@ TAO_LB_Random::_tao_next_member ( } void -TAO_LB_Random::init (void) +TAO_LB_Random::init () { #ifdef ACE_HAS_PTHREADS (void) ::pthread_once (&::tao_lb_once_control, diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp index cfddac5559a..23ab22f39c7 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_RoundRobin.cpp @@ -15,18 +15,18 @@ TAO_LB_RoundRobin::TAO_LB_RoundRobin (PortableServer::POA_ptr poa) { } -TAO_LB_RoundRobin::~TAO_LB_RoundRobin (void) +TAO_LB_RoundRobin::~TAO_LB_RoundRobin () { } char * -TAO_LB_RoundRobin::name (void) +TAO_LB_RoundRobin::name () { return CORBA::string_dup ("RoundRobin"); } CosLoadBalancing::Properties * -TAO_LB_RoundRobin::get_properties (void) +TAO_LB_RoundRobin::get_properties () { // There are no RoundRobin properties. Return an empty property // list. @@ -182,7 +182,7 @@ TAO_LB_RoundRobin::analyze_loads ( } PortableServer::POA_ptr -TAO_LB_RoundRobin::_default_POA (void) +TAO_LB_RoundRobin::_default_POA () { return PortableServer::POA::_duplicate (this->poa_.in ()); } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp index bccb7ac7c05..b3a8dfa4f56 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.cpp @@ -12,18 +12,18 @@ TAO_LB_ServerRequestInterceptor::TAO_LB_ServerRequestInterceptor ( { } -TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor (void) +TAO_LB_ServerRequestInterceptor::~TAO_LB_ServerRequestInterceptor () { } char * -TAO_LB_ServerRequestInterceptor::name (void) +TAO_LB_ServerRequestInterceptor::name () { return CORBA::string_dup ("TAO_LB_ServerRequestInterceptor"); } void -TAO_LB_ServerRequestInterceptor::destroy (void) +TAO_LB_ServerRequestInterceptor::destroy () { } @@ -125,7 +125,6 @@ TAO_LB_ServerRequestInterceptor::send_exception ( { // A CORBA::TRANSIENT is thrown when the LoadManager informs the // LoadAlert object that its member is overloaded, for example. - ORBSVCS_DEBUG ((LM_INFO, ACE_TEXT ("TAO_LB_ServerRequestInterceptor -- ") ACE_TEXT ("Exception thrown.\n"))); diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h index cb95039e570..a3ad143d70b 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_ServerRequestInterceptor.h @@ -49,7 +49,6 @@ class TAO_LoadBalancing_Export TAO_LB_ServerRequestInterceptor public virtual ::CORBA::LocalObject { public: - /// Constructor. TAO_LB_ServerRequestInterceptor (TAO_LB_LoadAlert & load_alert); @@ -82,7 +81,6 @@ public: //@} protected: - /// Destructor. /** * Protected destructor to enforce correct memory management via @@ -91,9 +89,7 @@ protected: ~TAO_LB_ServerRequestInterceptor (void); private: - TAO_LB_LoadAlert & load_alert_; - }; TAO_END_VERSIONED_NAMESPACE_DECL diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/README b/TAO/orbsvcs/orbsvcs/LoadBalancing/README index 84bf1466c3e..175e8e074fd 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/README +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/README @@ -1,5 +1,3 @@ - - This directory contains the implementations of the TAO Load Balancing service, which is called as Cygnus. |