Deadlock fix, and other changes.

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index eb05b492d9adc4222ab64524164e25d1a40a286e..4573776936e660dbdf29370c224f9e538b808012 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -12,46 +12,38 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 class compare {
 public : 
-       bool operator()(const neighbor*a, const neighbor*b)     {
-               return a->get_load()>b->get_load();
-       }
+    bool operator()(const neighbor*a, const neighbor*b)        {
+        return a->get_load()>b->get_load();
+    }
 };
 
 double loba_fairstrategy::load_balance(double my_load)
 {
-    int imin = -1;
-    int imax = -1;
-    double min = my_load;
-    double max = -1.0;
-
-               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) {
-        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++;
-                               }
-                       }
-               }
-
-
-               
-               return sum_sent;
+    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) {
+            double l = pneigh[i]->get_load();
+            if (l >= my_load)
+                continue;
+            if (l < 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++;
+            }
+        }
+    }
+
+    return sum_sent;
 }
 
 // Local variables: