Skip to content

emulab-devel
emulab-devel
Commit 467f38f4 authored by Robert Ricci's avatar Robert Ricci
Browse files
Options

Rescue LOAD_BALANCE option from bitrot

parent e098b020
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
assign/score.cc
View file @ 467f38f4
......@@ -1064,8 +1064,8 @@ void remove_node(vvertex vv)
#ifdef LOAD_BALANCE
// Use this tricky formula to score based on how 'full' the pnode is, so that
// we prefer to equally fill the minimum number of pnodes
SSUB(SCORE_PNODE * (powf(1+ ((pnode->current_load+1) * 1.0)/pnode->max_load,2)));
SADD(SCORE_PNODE * (powf(1+ pnode->current_load * 1.0/pnode->max_load,2)));
SSUB(SCORE_PNODE * (powf(1+ ((tr->get_current_load()+1) * 1.0)/tr->get_max_load(),2)));
SADD(SCORE_PNODE * (powf(1+ tr->get_current_load() * 1.0/tr->get_max_load(),2)));
#endif
if (pnode->total_load == 0) {
// If the pnode is now free, we need to do some cleanup
......@@ -1463,8 +1463,8 @@ int add_node(vvertex vv,pvertex pv, bool deterministic, bool is_fixed, bool skip
}
}
#ifdef LOAD_BALANCE
SSUB(SCORE_PNODE * (powf(1 + ((pnode->current_load-1) * 1.0)/pnode->max_load,2)));
SADD(SCORE_PNODE * (powf(1 + ((pnode->current_load) * 1.0)/pnode->max_load,2)));
SSUB(SCORE_PNODE * (powf(1 + ((tr->get_current_load()-1) * 1.0)/tr->get_max_load(),2)));
SADD(SCORE_PNODE * (powf(1 + ((tr->get_current_load()) * 1.0)/tr->get_max_load(),2)));
#endif
// node no longer unassigned
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment