From: Arnaud Giersch <arnaud.giersch@iut-bm.univ-fcomte.fr>
Date: Tue, 18 Jan 2011 10:15:51 +0000 (+0100)
Subject: Improve log messages.
X-Git-Tag: v0.1~188^2~35
X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/commitdiff_plain/51a92ed1069b6790ae4d3910f1c3b445e96963d3?ds=inline;hp=-c

Improve log messages.
---

51a92ed1069b6790ae4d3910f1c3b445e96963d3
diff --git a/process.cpp b/process.cpp
index 99bd039..ac9ab24 100644
--- a/process.cpp
+++ b/process.cpp
@@ -106,10 +106,14 @@ int process::run()
             send();
         }
 
-        if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter)
+        if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) {
+            VERB2("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter);
             break;
-        if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter)
+        }
+        if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) {
+            VERB2("Reached lb_maxiter: %d/%d", lb_iter, opt::lb_maxiter);
             break;
+        }
         if (opt::time_limit && MSG_get_clock() >= opt::time_limit) {
             VERB2("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit);
             break;
@@ -123,22 +127,25 @@ int process::run()
         receive(wait);
 
         // one of our neighbor is finalizing
-        if (opt::exit_on_close && close_received)
+        if (opt::exit_on_close && close_received) {
+            VERB0("Close received");
             break;
+        }
 
         // have no load and cannot receive anything
-        if (load == 0.0 && !may_receive())
+        if (load == 0.0 && !may_receive()) {
+            VERB0("I'm a poor lonesome process, and I have no load...");
             break;
+        }
 
         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!
         // fixme: should this chunk be moved before call to receive() ?
         if (100.0 * total_load_running / total_load_init <=
             opt::load_ratio_threshold) {
-            VERB0("No more load to balance in system, stopping.");
+            VERB0("No more load to balance in system.");
             break;
         }
-
     }
     VERB0("Going to finalize...");
     finalize();
@@ -150,10 +157,16 @@ int process::run()
      */
 
     VERB0("Done.");
-    INFO3("Final load after %d iteration%s: %g",
-          comp_iter, ESSE(comp_iter), load);
-    if (opt::bookkeeping)
-        INFO1("Expected load: %g", expected_load);
+    if (opt::bookkeeping) {
+        INFO4("Final load after %d:%d iterations: %g ; expected: %g",
+              comp_iter, lb_iter, load, expected_load);
+    } else {
+        INFO2("Final load after %d iterations: %g",
+              comp_iter, load);
+        if (comp_iter != lb_iter)
+            WARN2("comp_iter (%d) and lb_iter (%d) differ!",
+                  comp_iter, lb_iter);
+    }
     return 0;
 }