From c302818952b9b0f8b0cf9792385f431210bca2c9 Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 10 Feb 2011 23:01:26 +0100 Subject: [PATCH] Keep track of load scheduled to be sent, and update total_load_running. --- main.cpp | 1 - process.cpp | 6 ++++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/main.cpp b/main.cpp index 9a33928..d7d9963 100644 --- 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(); - 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 26e1137..f997d99 100644 --- a/process.cpp +++ b/process.cpp @@ -189,6 +189,11 @@ void process::compute_loop() } 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(), @@ -310,6 +315,7 @@ void process::data_send(neighbor& nb) } 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(), -- 2.39.5