Use static instead of volatile for variables that may be clobbered by a TRY..CATCH.

[loba.git] / loba_simple.cpp

diff --git a/loba_simple.cpp b/loba_simple.cpp
index 3858acc3def5cdce168f93a3e8d3a3a0b54d46b6..5a0a153a706e46b7769d37eb8b06b5f93757c776 100644 (file)
--- a/loba_simple.cpp
+++ b/loba_simple.cpp
@@ -27,10 +27,11 @@ void loba_simple::load_balance()
             max = l;
         }
     }
             max = l;
         }
     }

-    if (imin != -1) {
-        // found someone
-        double balance = (get_load() - max) / 2;
-        XBT_DEBUG("%d:%g %d:%g %g %g", imin, min, imax, max, get_load(), balance);
+    if (imin != -1) {           // found someone
+        double balance = std::min((get_load() - min) / 2.0,
+                                  (get_load() - max));
+        XBT_DEBUG("%d:%g %d:%g %g %g",
+                  imin, min, imax, max, get_load(), balance);

         send(pneigh[imin], balance);
     }
 }
         send(pneigh[imin], balance);
     }
 }