X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/46ef54f8ce05841e476c3cd9d425a9c680a84882..0c4a3402a57c61218bf1d1c6d8c31f5c3e1482f9:/main.cpp?ds=inline

diff --git a/main.cpp b/main.cpp
index 3ee3ae1..01bf3ac 100644
--- a/main.cpp
+++ b/main.cpp
@@ -3,13 +3,6 @@
 #include <stdexcept>
 #include <msg/msg.h>
 #include <xbt/log.h>
-#include "deployment.h"
-#include "hostdata.h"
-#include "misc.h"
-#include "options.h"
-#include "process.h"
-#include "timer.h"
-#include "version.h"
 
 // Creates log categories
 XBT_LOG_NEW_CATEGORY(simu, "Root of simulation messages");
@@ -21,6 +14,14 @@ XBT_LOG_NEW_SUBCATEGORY(loba, simu, "Messages from load-balancer");
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(main);
 
+#include "deployment.h"
+#include "hostdata.h"
+#include "misc.h"
+#include "options.h"
+#include "process.h"
+#include "timer.h"
+#include "version.h"
+
 // Failure exit status
 enum {
     EXIT_NO_FAILURE    = 0x00,  // no error
@@ -47,21 +48,31 @@ int simulation_main(int argc, char* argv[])
 
 void check_for_lost_load()
 {
-    const double threshold = 1e-4;
     double total_init = process::get_total_load_init();
+
     double total_exit = process::get_total_load_exit();
     double lost = total_init - total_exit;
-    double lost_ratio = 100 * lost / total_init;
-    if (lost_ratio < -threshold) {
+    double lost_ratio = 100.0 * lost / total_init;
+    if (lost_ratio < -opt::load_ratio_threshold)
         CRITICAL2("Gained load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
-    } else if (lost_ratio > threshold) {
+    else if (lost_ratio > opt::load_ratio_threshold)
         CRITICAL2("Lost load at exit! %g (%g%%) <============",
                   lost, lost_ratio);
-    } else {
+    else
         DEBUG2("Total load at exit looks good: %g (%g%%)", lost, lost_ratio);
-    }
 
+    double total_running = process::get_total_load_running();
+    double running_ratio = 100.0 * total_running / total_init;
+    if (running_ratio < -opt::load_ratio_threshold)
+        CRITICAL2("Negative running load at exit! %g (%g%%) <============",
+                  total_running, running_ratio);
+    else if (running_ratio > opt::load_ratio_threshold)
+        CRITICAL2("Remaining running load at exit! %g (%g%%) <============",
+                  total_running, running_ratio);
+    else
+        DEBUG2("Running load at exit looks good: %g (%g%%)",
+               total_running, running_ratio);
 }
 
 int main(int argc, char* argv[])