Bug fix: only send to a lesser loaded neighbor!

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index fd710c2bf60024e6384d3eed820493062e663406..9942fac1b1847616a9518788df811ceb2d38cb0e 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -1,41 +1,46 @@
-#include "loba_fairstrategy.h"
-
+#include <algorithm>

 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 #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
  */
 /* 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)
 {
 double loba_fairstrategy::load_balance(double my_load)
 {

-    int imin = -1;
-    int imax = -1;
-    double min = my_load;
-    double max = -1.0;
-    for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
-        double l = pneigh[i]->get_load();
-        if (l >= my_load)
-            continue;
-        if (l < min) {
-            imin = i;
-            min = l;
-        }
-        if (l > max) {
-            imax = i;
-            max = l;
+    std::sort(pneigh.begin(), pneigh.end(), compare());
+
+    print_loads_p();
+
+    double sum_sent = 0;
+    bool found = true;
+
+    while (found) {
+        found = false;
+        for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
+            if (pneigh[i]->get_load() <= my_load - 2) {
+                found = true;
+                pneigh[i]->add_load(1);
+                pneigh[i]->add_to_send(1);
+                INFO1("sent to %s", pneigh[i]->get_name());
+                my_load--;
+                sum_sent++;
+            }

         }
     }
         }
     }

-    if (imin != -1) {
-        // found someone
-        double balance = (my_load - max) / 2;
-        DEBUG6("%d:%g %d:%g %g %g", imin, min, imax, max, my_load, balance);
-        pneigh[imin]->set_to_send(balance);
-        return balance;
-    } else {
-        return 0.0;
-    }
+
+    return sum_sent;

 }
 
 // Local variables:
 }
 
 // Local variables: