Move declarations at proper place, and fix indentation.

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 8e9f5245fd896a8cd9cfcff05ff51a53b3235c48..2b1b36936b0dba553cdf7460082b546befe9e0d6 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -128,12 +128,16 @@ void process::load_balance_loop()
             ++lb_iter;
         }
 
             ++lb_iter;
         }
 

+        if (!opt::bookkeeping)
+            expected_load = real_load - get_sum_of_to_send();
+        // nothing to do with opt::bookkeeping
+

         if (opt::log_rate && lb_iter % opt::log_rate == 0) {
             XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
             XBT_VERB("... expected load: %g", expected_load);
         }
 
         if (opt::log_rate && lb_iter % opt::log_rate == 0) {
             XBT_INFO("(%u:%u) current load: %g", lb_iter, comp_iter, real_load);
             XBT_VERB("... expected load: %g", expected_load);
         }
 

-        if (get_load() > 0.0)
+        if (expected_load > 0.0)

             load_balance();
 
         print_loads(true, xbt_log_priority_debug);
             load_balance();
 
         print_loads(true, xbt_log_priority_debug);


@@ -141,7 +145,7 @@ void process::load_balance_loop()
         // send
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));
         // send
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::ctrl_send, this, _1));

-        prev_load_broadcast = get_load();
+        prev_load_broadcast = expected_load;

 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         ctrl_receive(0.0);
 
         sleep_until_date(next_iter_after_date, opt::min_lb_iter_duration);
         ctrl_receive(0.0);


@@ -272,14 +276,14 @@ void process::load_balance()
 
 void process::send(neighbor& nb, double amount)
 {
 
 void process::send(neighbor& nb, double amount)
 {

-    set_load(get_load() - amount);
+    expected_load -= amount;

     nb.set_to_send(nb.get_to_send() + amount);
     nb.set_load(nb.get_load() + amount);
 }
 
 void process::ctrl_send(neighbor& nb)
 {
     nb.set_to_send(nb.get_to_send() + amount);
     nb.set_load(nb.get_load() + amount);
 }
 
 void process::ctrl_send(neighbor& nb)
 {

-    double info_to_send = get_load();
+    double info_to_send = expected_load;

     if (info_to_send != prev_load_broadcast)
         comm.ctrl_send(nb.get_ctrl_mbox(),
                        new message(message::INFO, info_to_send));
     if (info_to_send != prev_load_broadcast)
         comm.ctrl_send(nb.get_ctrl_mbox(),
                        new message(message::INFO, info_to_send));


@@ -310,7 +314,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
+        real_load -= load_to_send;

     }
     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(),


@@ -356,7 +360,7 @@ void process::handle_message(message* msg, m_host_t from)
     switch (msg->get_type()) {
     case message::INFO: {
         neighbor* n = rev_neigh[from];
     switch (msg->get_type()) {
     case message::INFO: {
         neighbor* n = rev_neigh[from];

-        n->set_load(msg->get_amount());
+        n->set_load(msg->get_amount() + n->get_to_send());

         break;
     }
     case message::CREDIT:
         break;
     }
     case message::CREDIT: