Define variadic logging macros.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 54573d376232ab2d9a973db2ef8a9c9d2095a1ea..57c06612ad84bb9cffaa07123e8c113b0148fad9 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -44,6 +44,8 @@ process::process(int argc, char* argv[])
     close_received = false;
     finalizing = false;
 
     close_received = false;
     finalizing = false;
 

+    comp_iter = lb_iter = 0;
+

     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
         return;
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
         return;


@@ -81,7 +83,6 @@ int process::run()
     double next_iter_after_date = 0.0;
     INFO1("Initial load: %g", real_load);
     VERB0("Starting...");
     double next_iter_after_date = 0.0;
     INFO1("Initial load: %g", real_load);
     VERB0("Starting...");

-    comp_iter = lb_iter = 0;

     while (true) {
         if (get_load() > 0.0) {
             double now = MSG_get_clock();
     while (true) {
         if (get_load() > 0.0) {
             double now = MSG_get_clock();


@@ -314,10 +315,10 @@ void process::finalize()
     std::for_each(neigh.begin(), neigh.end(),
                   bind(&process::finalize1, this, _1));
 
     std::for_each(neigh.begin(), neigh.end(),
                   bind(&process::finalize1, this, _1));
 

-    DEBUG2("wait for CLOSE from %lu neighbor%s",
-           (unsigned long )neigh.size(), ESSE(neigh.size()));

     while (may_receive()) {
         comm.flush(false);
     while (may_receive()) {
         comm.flush(false);

+        DEBUG2("waiting for %d CTRL and %d DATA CLOSE",
+               ctrl_close_pending, data_close_pending);

         receive(-1.0);
     }
 
         receive(-1.0);
     }