Keep track of load scheduled to be sent, and update total_load_running.

diff --git a/main.cpp b/main.cpp
index 9a339282d115805bc6178ccdeb85fd1e6c7f42ed..d7d9963ad1792894e334f0ce1668361b6546b057 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -87,7 +87,6 @@ static int simulation_main(int argc, char* argv[])
 static void check_for_lost_load()
 {
     double total_init = process::get_total_load_init();
 static void check_for_lost_load()
 {
     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.0 * lost / total_init;
     double total_exit = process::get_total_load_exit();
     double lost = total_init - total_exit;
     double lost_ratio = 100.0 * lost / total_init;

diff --git a/process.cpp b/process.cpp
index 26e11370216a4de9b928035d467dadae39f7a041..f997d99efc7c1127520e535e7e75e61ea1bd14d0 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -189,6 +189,11 @@ void process::compute_loop()
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);
     }
 
     XBT_VERB("Going to finalize for %s...", __func__);

+    // last send, for not losing load scheduled to be sent
+    std::for_each(neigh.begin(), neigh.end(),
+                  bind(&process::data_send, this, _1));
+    finalizing = true;
+    total_load_running -= real_load;

     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
     XBT_DEBUG("send DATA_CLOSE to %zu neighbor%s",
               neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),


@@ -310,6 +315,7 @@ void process::data_send(neighbor& nb)
     } else {
         load_to_send = nb.get_to_send();
         nb.set_to_send(0.0);
     } else {
         load_to_send = nb.get_to_send();
         nb.set_to_send(0.0);

+        // do not update real_load here

     }
     if (load_to_send > 0.0)
         comm.data_send(nb.get_data_mbox(),
     }
     if (load_to_send > 0.0)
         comm.data_send(nb.get_data_mbox(),