X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/431ac6bd7924ab99473c9a621a25ab0c555c3e60..e02d85948b5f10d8b37e39ec94d915c48f46a15a:/process.cpp?ds=sidebyside

diff --git a/process.cpp b/process.cpp
index 339938a..1556f3c 100644
--- a/process.cpp
+++ b/process.cpp
@@ -13,10 +13,13 @@
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 
+double process::total_load_init = 0.0;
+double process::total_load_exit = 0.0;
+
 process::process(int argc, char* argv[])
 {
     if (argc < 2 || !(std::istringstream(argv[1]) >> load))
-        throw std::invalid_argument("bad or missing initial load");
+        throw std::invalid_argument("bad or missing initial load parameter");
 
     neigh.assign(argv + 2, argv + argc);
 
@@ -29,6 +32,7 @@ process::process(int argc, char* argv[])
     }
 
     expected_load = load;
+    total_load_init += load;
 
     ctrl_close_pending = data_close_pending = neigh.size();
     if (neigh.size() == 1) {
@@ -56,19 +60,20 @@ process::process(int argc, char* argv[])
 
 process::~process()
 {
+    total_load_exit += load;
 }
 
 int process::run()
 {
-    bool one_more = true;
-
     INFO1("Initial load: %g", load);
     VERB0("Starting...");
     // first send() to inform neighbors about our load (force it)
-    prev_load_broadcast = !(opt::bookkeeping? expected_load: load);
-    send();
+    prev_load_broadcast = -1;
     iter = 0;
-    while (one_more) {
+    bool one_more = true;
+    do {
+        ++iter;
+
         if (opt::log_rate && iter % opt::log_rate == 0) {
             if (opt::bookkeeping)
                 INFO3("(%u) current load: %g ; expected: %g",
@@ -79,26 +84,37 @@ int process::run()
         }
         print_loads(xbt_log_priority_debug);
 
-        bool do_compute = load > 0.0;
-        if (do_compute) {
-            compute();
-            ++iter;
-        }
-
-        bool close_received = !receive(do_compute? NO_WAIT: WAIT);
-
         if (opt::bookkeeping)
             expected_load -= load_balance(expected_load);
         else
             load -= load_balance(load);
 
         send();
+        compute();
 
-        if (opt::exit_on_close && close_received)
-            one_more = false;
-        if (opt::maxiter && iter >= opt::maxiter)
-            one_more = false;
-    }
+// NDS for Need To Send
+#define NDS ((opt::bookkeeping ? expected_load : load) != prev_load_broadcast)
+        bool can_recv;
+        do {
+            // General idea: do not iterate if there is nothing to
+            // compute, nor to send.
+
+            // fixme: review this chunk, and remove this NDS macro!
+
+            bool recv_wait = (load == 0 && !NDS);
+            bool close_received = !receive(recv_wait? WAIT: NO_WAIT);
+
+            if (opt::exit_on_close && close_received)
+                one_more = false;
+            else if (opt::maxiter && iter >= opt::maxiter)
+                one_more = false;
+            
+            can_recv = (ctrl_close_pending || data_close_pending);
+
+        } while (one_more && can_recv && load == 0 && !NDS);
+#undef NDS
+
+    } while (one_more);
     VERB0("Going to finalize...");
     finalize();
 
@@ -109,11 +125,9 @@ int process::run()
      */
 
     VERB0("Done.");
+    INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);
     if (opt::bookkeeping)
-        INFO4("Final load after %d iteration%s: %g ; expected: %g",
-              iter, ESSE(iter), load, expected_load);
-    else
-        INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);
+        INFO1("Expected load: %g", expected_load);
     return 0;
 }
 
@@ -129,16 +143,22 @@ double process::sum_of_to_send() const
 
 double process::load_balance(double /*my_load*/)
 {
+    if (iter == 1)
+        WARN0("process::load_balance is a no-op!");
     return 0.0;
 }
 
 void process::compute()
 {
-    double duration = opt::comp_cost(load);
-    m_task_t task = MSG_task_create("computation", duration, 0.0, NULL);
-    DEBUG2("compute %g flop%s.", duration, ESSE(duration));
-    MSG_task_execute(task);
-    MSG_task_destroy(task);
+    if (load > 0.0) {
+        double duration = opt::comp_cost(load);
+        m_task_t task = MSG_task_create("computation", duration, 0.0, NULL);
+        DEBUG2("compute %g flop%s.", duration, ESSE(duration));
+        MSG_task_execute(task);
+        MSG_task_destroy(task);
+    } else {
+        DEBUG0("nothing to compute !");
+    }
 }
 
 void process::send1_no_bookkeeping(neighbor& nb)
@@ -186,7 +206,6 @@ void process::send()
     using namespace std::tr1;
     using namespace std::tr1::placeholders;
 
-    // fixme: shall we send data at all iterations?
     if (opt::bookkeeping) {
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::send1_bookkeeping, this, _1));
@@ -198,9 +217,10 @@ void process::send()
     }
 }
 
-// Returns false if a CLOSE message was received. 
 bool process::receive(recv_wait_mode wait)
 {
+    // DEBUG1("go for receive(%s)",
+    //        "NO_WAIT\0WAIT\0\0\0\0WAIT_FOR_CLOSE" + 8 * wait);
     bool result = true;
     message* msg;
     m_host_t from;