X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/36f2b9a493e14c00fec410c84dfaff6a654ce929..7fda6bebf9fc5cd93a34234737bb57f605e765ed:/loba_fairstrategy.cpp diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp index ba5a7d9..4054729 100644 --- a/loba_fairstrategy.cpp +++ b/loba_fairstrategy.cpp @@ -1,49 +1,26 @@ -#include <algorithm> #include <xbt/log.h> XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba); #include "loba_fairstrategy.h" -/* simple version: - * load balance with a least-loaded neighbor, - * without breaking the ping-pong condition - */ - -class compare { -public : - bool operator()(const neighbor*a, const neighbor*b) { - return a->get_load()>b->get_load(); - } -}; - -double loba_fairstrategy::load_balance(double my_load) +void loba_fairstrategy::load_balance() { - std::sort(pneigh.begin(), pneigh.end(), compare()); + pneigh_sort_by_load(std::greater<double>()); + print_loads_p(false, xbt_log_priority_debug); - print_loads_p(); - - double sum_sent=0; - bool found=true; - - while(found) { - found=false; + const double delta = 0.001; + bool found = true; + while (found) { + found = false; for (unsigned i = 0 ; i < pneigh.size() ; ++i) { - double l = pneigh[i]->get_load(); - if (l >= my_load) - continue; - if (l < my_load+2) { - found=true; - pneigh[i]->set_load(l+1); - pneigh[i]->add_to_send(1); - INFO1("sent to %s",pneigh[i]->get_name()); - my_load--; - sum_sent++; + if (pneigh[i]->get_load() <= get_load() - 2 * delta) { + found = true; + send(pneigh[i], delta); + XBT_DEBUG("sent to %s", pneigh[i]->get_name()); } } } - - return sum_sent; } // Local variables: