]> AND Private Git Repository - loba.git/blobdiff - process.cpp
Logo AND Algorithmique Numérique Distribuée

Private GIT Repository
Cleanup, no functional change (no bug fixed too).
[loba.git] / process.cpp
index b0d702644de509e4cc2e12c53212847e924a07ac..a24d6ebcbfb5eae01f098611a3373a00f06a872f 100644 (file)
@@ -1,5 +1,3 @@
-#include "process.h"
-
 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>
@@ -8,10 +6,16 @@
 #include <sstream>
 #include <xbt/log.h>
 #include <xbt/time.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
+
 #include "misc.h"
 #include "options.h"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
+#include "process.h"
+
+double process::total_load_init = 0.0;
+double process::total_load_exit = 0.0;
 
 process::process(int argc, char* argv[])
 {
@@ -28,14 +32,19 @@ process::process(int argc, char* argv[])
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 
+    prev_load_broadcast = -1;   // force sending of load on first send()
     expected_load = load;
+    total_load_init += load;
 
     ctrl_close_pending = data_close_pending = neigh.size();
     if (neigh.size() == 1) {
         comm.next_close_on_ctrl_is_last();
         comm.next_close_on_data_is_last();
     }
-    if (neigh.size() > 0)
+    close_received = false;
+    may_receive =  (neigh.size() > 0); // the same as (ctrl_close_pending ||
+                                       //              data_close_pending)
+    if (may_receive)
         comm.listen();
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
@@ -51,24 +60,23 @@ process::process(int argc, char* argv[])
         oss << neigh.back().get_name();
     }
     LOG1(logp, "Got %s.", oss.str().c_str());
-    print_loads(logp);
+    print_loads(true, logp);
 }
 
 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();
     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",
@@ -77,15 +85,7 @@ int process::run()
                 INFO2("(%u) current load: %g",
                       iter, load);
         }
-        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);
+        print_loads(true, xbt_log_priority_debug);
 
         if (opt::bookkeeping)
             expected_load -= load_balance(expected_load);
@@ -93,12 +93,32 @@ int process::run()
             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)
+        do {
+            // General idea: block on receiving unless there is
+            // something to compute, or to send, or we must exit.
+
+            // fixme: review this chunk, and remove this NDS macro!
+
+            // FIXME: HAD A DEADLOCK HERE...
+
+            bool recv_wait = (load == 0 && !NDS);
+            DEBUG1("CALL RECEIVE(%s)", recv_wait? "WAIT": "NO_WAIT");
+            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;
+            
+        } while (one_more && may_receive && load == 0 && !NDS);
+        DEBUG0("RECEIVE LOOP ENDED");
+#undef NDS
+
+    } while (one_more);
     VERB0("Going to finalize...");
     finalize();
 
@@ -109,11 +129,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;
 }
 
@@ -136,11 +154,15 @@ double process::load_balance(double /*my_load*/)
 
 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)
@@ -199,13 +221,14 @@ void process::send()
     }
 }
 
-bool process::receive(recv_wait_mode wait)
+void process::receive(recv_wait_mode wait)
 {
-    bool result = true;
+    // DEBUG1("go for receive(%s)",
+    //        "NO_WAIT\0WAIT\0\0\0\0WAIT_FOR_CLOSE" + 8 * wait);
     message* msg;
     m_host_t from;
-    bool do_recv = ctrl_close_pending || data_close_pending;
-    while (do_recv && comm.recv(msg, from, wait)) {
+    bool do_loop = may_receive;
+    while (do_loop && comm.recv(msg, from, wait)) {
         switch (msg->get_type()) {
         case message::INFO: {
             neighbor* n = rev_neigh[from];
@@ -221,21 +244,20 @@ bool process::receive(recv_wait_mode wait)
         case message::CTRL_CLOSE:
             if (--ctrl_close_pending == 1)
                 comm.next_close_on_ctrl_is_last();
-            DEBUG1("ctrl_close_pending = %d", ctrl_close_pending);
-            result = false;
+            // DEBUG1("ctrl_close_pending = %d", ctrl_close_pending);
+            close_received = true;
             break;
         case message::DATA_CLOSE:
             if (--data_close_pending == 1)
                 comm.next_close_on_data_is_last();
-            DEBUG1("data_close_pending = %d", data_close_pending);
-            result = false;
+            // DEBUG1("data_close_pending = %d", data_close_pending);
+            close_received = true;
             break;
         }
         delete msg;
-        do_recv = (wait == WAIT_FOR_CLOSE) &&
-            (ctrl_close_pending || data_close_pending);
+        may_receive = (ctrl_close_pending || data_close_pending);
+        do_loop = (wait == WAIT_FOR_CLOSE) && may_receive;
     }
-    return result;
 }
 
 void process::finalize1(neighbor& nb)
@@ -261,23 +283,31 @@ void process::finalize()
     comm.flush(true);
 }
 
-void process::print_loads(e_xbt_log_priority_t logp)
+#define print_loads_generic(vec, verbose, logp, cat)                    \
+    if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \
+        using namespace std::tr1;                                       \
+        using namespace std::tr1::placeholders;                         \
+        XCLOG0(cat, logp, "Neighbor loads:");                           \
+        std::for_each(vec.begin(), vec.end(),                           \
+                      bind(&neighbor::print, _1, verbose, logp, cat));  \
+    } else ((void)0)
+
+void process::print_loads(bool verbose,
+                          e_xbt_log_priority_t logp,
+                          xbt_log_category_t cat) const
 {
-    if (!LOG_ISENABLED(logp))
-        return;
+    print_loads_generic(neigh, verbose, logp, cat);
+}
 
-    std::ostringstream oss;
-    if (neigh.empty()) {
-        oss << "no neighbor!";
-    } else {
-        std::transform(neigh.begin(), neigh.end() - 1,
-                       std::ostream_iterator<double>(oss, ", "),
-                       std::tr1::mem_fn(&neighbor::get_load));
-        oss << neigh.back().get_load();
-    }
-    LOG1(logp, "Neighbor loads: %s", oss.str().c_str());
+void process::print_loads_p(bool verbose,
+                            e_xbt_log_priority_t logp,
+                            xbt_log_category_t cat) const
+{
+    print_loads_generic(pneigh, verbose, logp, cat);
 }
 
+#undef print_loads_generic
+
 // Local variables:
 // mode: c++
 // End: