diff options
author | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-04-23 19:45:02 +0000 |
---|---|---|
committer | jai <jai@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2004-04-23 19:45:02 +0000 |
commit | 3578afbe433b28ded6a110eba4198d78febbed58 (patch) | |
tree | 3149ca44d06481d8b68a513db93ae7a56d8ca587 /TAO/orbsvcs/orbsvcs/LoadBalancing | |
parent | a1c40e56f54d94a508e37885720a9fda19ff1077 (diff) | |
download | ATCD-3578afbe433b28ded6a110eba4198d78febbed58.tar.gz |
Fri Apr 23 14:43:40 2004 Jaiganesh B <jai@dre.vanderbilt.edu>
Diffstat (limited to 'TAO/orbsvcs/orbsvcs/LoadBalancing')
-rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp | 27 | ||||
-rw-r--r-- | TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp | 27 |
2 files changed, 10 insertions, 44 deletions
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp index 0dc074a1e75..d6da83152c8 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadAverage.cpp @@ -282,28 +282,11 @@ TAO_LB_LoadAverage::analyze_loads ( // Iterate through the entire location list to determine // the location where the load has to be shed. - for (CORBA::ULong i = 0; i < len; ++i) + for (CORBA::ULong j = 0; j < len; ++j) { ACE_TRY_EX (SECOND) { - const PortableGroup::Location & loc = locations[i]; - - // Retrieve the load list for the location from the - // LoadManager and push it to this Strategy's load - // processor. - /* - CosLoadBalancing::LoadList_var current_loads = - load_manager->get_loads (loc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CosLoadBalancing::Load present_load; - this->push_loads (loc, - current_loads.in (), - present_load - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - */ + const PortableGroup::Location & loc = locations[j]; /* ACE_DEBUG ((LM_DEBUG, @@ -313,7 +296,7 @@ TAO_LB_LoadAverage::analyze_loads ( avg_load.value)); */ - if (tmp[i].value <= avg_load.value) + if (tmp[j].value <= avg_load.value) { load_manager->disable_alert (loc ACE_ENV_ARG_PARAMETER); @@ -322,9 +305,9 @@ TAO_LB_LoadAverage::analyze_loads ( else { CORBA::Float percent_diff = - (tmp[i].value / avg_load.value) - 1; + (tmp[j].value / avg_load.value) - 1; - if (tmp[i].value == avg_load.value) + if (tmp[j].value == avg_load.value) { percent_diff = 0; } diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp index 99967422297..a247293b071 100644 --- a/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp +++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/LB_LoadMinimum.cpp @@ -327,28 +327,11 @@ TAO_LB_LoadMinimum::analyze_loads ( // Iterate through the entire location list to determine // the location where the load has to be shed. - for (CORBA::ULong i = 0; i < len; ++i) + for (CORBA::ULong j = 0; j < len; ++j) { ACE_TRY_EX (SECOND) { - const PortableGroup::Location & loc = locations[i]; - - // Retrieve the load list for the location from the - // LoadManager and push it to this Strategy's load - // processor. - /* - CosLoadBalancing::LoadList_var current_loads = - load_manager->get_loads (loc - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - - CosLoadBalancing::Load present_load; - this->push_loads (loc, - current_loads.in (), - present_load - ACE_ENV_ARG_PARAMETER); - ACE_TRY_CHECK; - */ + const PortableGroup::Location & loc = locations[j]; /* ACE_DEBUG ((LM_DEBUG, @@ -358,7 +341,7 @@ TAO_LB_LoadMinimum::analyze_loads ( avg_load.value)); */ - if (tmp[i].value <= avg_load.value) + if (tmp[j].value <= avg_load.value) { load_manager->disable_alert (loc ACE_ENV_ARG_PARAMETER); @@ -368,9 +351,9 @@ TAO_LB_LoadMinimum::analyze_loads ( { CORBA::Float percent_diff = - (tmp[i].value / min_load) - 1; + (tmp[j].value / min_load) - 1; - if (tmp[i].value == min_load) + if (tmp[j].value == min_load) { percent_diff = 0; } |