X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/4096be9a95ef90a463f9721817750ad84f141b0a..7154ea8a74d7566156c7e65034fdbad45d230cf5:/loba_simple.cpp?ds=sidebyside diff --git a/loba_simple.cpp b/loba_simple.cpp index 5702fba..3858acc 100644 --- a/loba_simple.cpp +++ b/loba_simple.cpp @@ -8,15 +8,15 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba); * load balance with a least-loaded neighbor, * without breaking the ping-pong condition */ -double loba_simple::load_balance(double my_load) +void loba_simple::load_balance() { int imin = -1; int imax = -1; - double min = my_load; + double min = get_load(); double max = -1.0; for (unsigned i = 0 ; i < pneigh.size() ; ++i) { double l = pneigh[i]->get_load(); - if (l >= my_load) + if (l >= get_load()) continue; if (l < min) { imin = i; @@ -29,13 +29,9 @@ double loba_simple::load_balance(double my_load) } if (imin != -1) { // found someone - double balance = (my_load - min) / 2; - DEBUG6("%d:%g %d:%g %g %g", imin, min, imax, max, my_load, balance); - pneigh[imin]->set_to_send(balance); - pneigh[imin]->add_load(balance); - return balance; - } else { - return 0.0; + double balance = (get_load() - max) / 2; + XBT_DEBUG("%d:%g %d:%g %g %g", imin, min, imax, max, get_load(), balance); + send(pneigh[imin], balance); } }