Keep track of load scheduled to be sent, and update total_load_running.

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index 9942fac1b1847616a9518788df811ceb2d38cb0e..5530f5a5be94a2a6d989fefa50a17d733b464bff 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -1,46 +1,29 @@
-#include <algorithm>

 #include <xbt/log.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 #include "loba_fairstrategy.h"
 
 #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());
+    const double delta = 0.001;

 
 

-    print_loads_p();
+    pneigh_sort_by_load(std::greater<double>());
+
+    print_loads_p(false, xbt_log_priority_debug);

 
 

-    double sum_sent = 0;

     bool found = true;
 
     while (found) {
         found = false;
         for (unsigned i = 0 ; i < pneigh.size() ; ++i) {
     bool found = true;
 
     while (found) {
         found = false;
         for (unsigned i = 0 ; i < pneigh.size() ; ++i) {

-            if (pneigh[i]->get_load() <= my_load - 2) {
+            if (pneigh[i]->get_load() <= get_load() - 2 * delta) {

                 found = true;
                 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++;
+                send(pneigh[i], delta);
+                XBT_DEBUG("sent to %s", pneigh[i]->get_name());

             }
         }
     }
             }
         }
     }

-
-    return sum_sent;

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