diff options
Diffstat (limited to 'orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp')
| -rw-r--r-- | orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 072a257810c..90dd6c015e4 100644 --- a/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -1,3 +1,5 @@ +// $Id$ + #include "orbsvcs/LoadBalancing/LB_LoadMinimum.h" #include "ace/OS_NS_sys_time.h" #include "orbsvcs/LoadBalancing/LB_LoadMap.h" @@ -11,12 +13,6 @@ #include "ace/Null_Mutex.h" #include "ace/OS_NS_string.h" - -ACE_RCSID (LoadBalancing, - LB_LoadMinimum, - "$Id$") - - #if !defined (__ACE_INLINE__) #include "orbsvcs/LoadBalancing/LB_LoadMinimum.inl" #endif /* defined INLINE */ @@ -34,7 +30,7 @@ TAO_LB_LoadMinimum::TAO_LB_LoadMinimum (PortableServer::POA_ptr poa) { // A load map that retains previous load values at a given location // and lock are only needed if dampening is enabled, i.e. non-zero. - if (this->dampening_ != 0) + if (!ACE::is_equal (this->dampening_, 0.0f)) { ACE_NEW (this->load_map_, TAO_LB_LoadMap (TAO_PG_MAX_LOCATIONS)); @@ -104,7 +100,7 @@ TAO_LB_LoadMinimum::push_loads ( { ACE_GUARD (TAO_SYNCH_MUTEX, guard, *this->lock_); - TAO_LB_LoadMap::ENTRY * entry; + TAO_LB_LoadMap::ENTRY * entry = 0; if (this->load_map_->find (the_location, entry) == 0) { CosLoadBalancing::Load & previous_load = entry->int_id_; @@ -266,7 +262,7 @@ TAO_LB_LoadMinimum::analyze_loads ( total_load.value = total_load.value + load.value; tmp[i] = load; - if ((load.value < min_load) && (load.value != 0)) + if ((load.value < min_load) && !ACE::is_equal (load.value, 0.0f)) { min_load = load.value; } @@ -320,7 +316,7 @@ TAO_LB_LoadMinimum::analyze_loads ( CORBA::Float percent_diff = (tmp[j].value / min_load) - 1; - if (tmp[j].value == min_load) + if (ACE::is_equal (tmp[j].value, min_load)) { percent_diff = 0; } @@ -413,7 +409,7 @@ TAO_LB_LoadMinimum::get_location ( if (load.value < min_load) { - if (i > 0 && load.value != 0) + if (i > 0 && !ACE::is_equal (load.value, 0.0f)) { /* percent difference = |