Deadlock fix, and other changes.

[loba.git] / main.cpp

diff --git a/main.cpp b/main.cpp
index fe584f725f6518347b6e4b096ff10198888bb8a0..01bf3ac34926c11459e62f4b925ce313851b7204 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -48,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[])