Rewrite macro ESSE() and get rid of misc::str_nil.

[loba.git] / loba_fairstrategy.cpp

diff --git a/loba_fairstrategy.cpp b/loba_fairstrategy.cpp
index 7e02a21361c646ea6aabc18e084d7233cc2ab219..a9f8e6048fb379c0d74d5bfed060887a00101c44 100644 (file)
--- a/loba_fairstrategy.cpp
+++ b/loba_fairstrategy.cpp
@@ -5,11 +5,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(loba);
 
 #include "loba_fairstrategy.h"
 
 
 #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) {
 class compare {
 public:
     bool operator()(const neighbor*a, const neighbor*b) {


@@ -19,19 +14,20 @@ public:
 
 void loba_fairstrategy::load_balance()
 {
 
 void loba_fairstrategy::load_balance()
 {

+    const double delta = 0.001;
+

     std::sort(pneigh.begin(), pneigh.end(), compare());
 
     std::sort(pneigh.begin(), pneigh.end(), compare());
 

-               // print_loads_p();
-    //print_loads_p(false, xbt_log_priority_debug);
+    print_loads_p(false, xbt_log_priority_debug);

 
     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() <= get_load() - 2) {
+            if (pneigh[i]->get_load() <= get_load() - 2 * delta) {

                 found = true;
                 found = true;

-                send(pneigh[i], 1);
+                send(pneigh[i], delta);

                 DEBUG1("sent to %s", pneigh[i]->get_name());
             }
         }
                 DEBUG1("sent to %s", pneigh[i]->get_name());
             }
         }