X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/0c4a3402a57c61218bf1d1c6d8c31f5c3e1482f9..4fe47748b018bd1d159839fe9e2bb6685a895e85:/process.cpp

diff --git a/process.cpp b/process.cpp
index 8b31678..80fd618 100644
--- a/process.cpp
+++ b/process.cpp
@@ -33,22 +33,16 @@ process::process(int argc, char* argv[])
         rev_neigh.insert(std::make_pair(host, ptr));
     }
 
+    comp = 0.0;
+
     prev_load_broadcast = -1;   // force sending of load on first send()
     expected_load = load;
     total_load_running += 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();
-    }
     close_received = false;
-    may_receive =  (neigh.size() > 0); // the same as (ctrl_close_pending ||
-                                       //              data_close_pending)
     finalizing = false;
-    if (may_receive)
-        comm.listen();
 
     e_xbt_log_priority_t logp = xbt_log_priority_verbose;
     if (!LOG_ISENABLED(logp))
@@ -73,62 +67,88 @@ process::~process()
 
 int process::run()
 {
+    double next_iter_after_date = 0.0;
     INFO1("Initial load: %g", load);
     VERB0("Starting...");
-    iter = 0;
+    comp_iter = lb_iter = 0;
     while (true) {
-        if (load > 0.0) {
-            ++iter;
-            if (opt::log_rate && iter % opt::log_rate == 0) {
+        double ld = lb_load();
+        if (ld > 0.0) {
+            double now = MSG_get_clock();
+            if (now < next_iter_after_date)
+                MSG_process_sleep(next_iter_after_date - now);
+            next_iter_after_date = MSG_get_clock() + opt::min_iter_duration;
+
+            ++lb_iter;
+
+            if (opt::log_rate && lb_iter % opt::log_rate == 0) {
                 if (opt::bookkeeping)
-                    INFO3("(%u) current load: %g ; expected: %g",
-                          iter, load, expected_load);
+                    INFO4("(%u:%u) current load: %g ; expected: %g",
+                          lb_iter, comp_iter, load, expected_load);
                 else
                     INFO2("(%u) current load: %g",
-                          iter, load);
+                          lb_iter, load);
             }
 
-            if (opt::bookkeeping)
-                expected_load -= load_balance(expected_load);
-            else
-                load -= load_balance(load);
+            ld -= load_balance(ld);
 
             print_loads(true, xbt_log_priority_debug);
+        }
+        lb_load() = ld;
 
-            send();
+        // send load information, and load (data) if any
+        send();
+        if (load > 0.0) {
+            ++comp_iter;
             compute();
+        }
 
-            if (opt::maxiter && iter >= opt::maxiter)
-                break;
-        } else {
-            // send load information, and load when bookkeeping
-            send();
+        if (opt::lb_maxiter && lb_iter >= opt::lb_maxiter) {
+            VERB2("Reached lb_maxiter: %d/%d", lb_iter, opt::lb_maxiter);
+            break;
+        }
+        if (opt::comp_maxiter && comp_iter >= opt::comp_maxiter) {
+            VERB2("Reached comp_maxiter: %d/%d", comp_iter, opt::comp_maxiter);
+            break;
+        }
+        if (opt::time_limit && MSG_get_clock() >= opt::time_limit) {
+            VERB2("Reached time limit: %g/%g", MSG_get_clock(), opt::time_limit);
+            break;
         }
 
         // block on receiving unless there is something to compute or
         // to send
-        bool recv_wait = (load == 0 &&
-                          ((opt::bookkeeping ? expected_load : load)
-                           == prev_load_broadcast));
-        DEBUG1("CALL RECEIVE(%s)", recv_wait? "WAIT": "NO_WAIT");
-        receive(recv_wait? WAIT: NO_WAIT);
+        double timeout;
+        if (load != 0 || lb_load() != prev_load_broadcast)
+            timeout = 0.0;
+        else if (opt::min_iter_duration)
+            timeout = opt::min_iter_duration;
+        else
+            timeout = 1.0;
+        receive(timeout);
 
         // one of our neighbor is finalizing
-        if (opt::exit_on_close && close_received)
+        if (opt::exit_on_close && close_received) {
+            VERB0("Close received");
             break;
+        }
 
         // have no load and cannot receive anything
-        if (load == 0.0 && !may_receive)
+        if (load == 0.0 && !may_receive()) {
+            VERB0("I'm a poor lonesome process, and I have no load...");
             break;
+        }
 
         // fixme: this check should be implemented with a distributed
         // algorithm, and not a shared global variable!
+        // fixme: should this chunk be moved before call to receive() ?
         if (100.0 * total_load_running / total_load_init <=
             opt::load_ratio_threshold) {
-            VERB0("No more load to balance in system, stopping.");
+            VERB0("No more load to balance in system.");
             break;
+        } else {
+            DEBUG1("still %g load to balance, continuing...", total_load_running);
         }
-
     }
     VERB0("Going to finalize...");
     finalize();
@@ -140,16 +160,24 @@ int process::run()
      */
 
     VERB0("Done.");
-    INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);
-    if (opt::bookkeeping)
-        INFO1("Expected load: %g", expected_load);
+    if (opt::bookkeeping) {
+        INFO4("Final load after %d:%d iterations: %g ; expected: %g",
+              lb_iter, comp_iter, load, expected_load);
+    } else {
+        INFO2("Final load after %d iterations: %g",
+              lb_iter, load);
+        if (lb_iter != comp_iter)
+            WARN2("lb_iter (%d) and comp_iter (%d) differ!",
+                  lb_iter, comp_iter);
+    }
     return 0;
 }
 
 double process::sum_of_to_send() const
 {
-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
+    using std::tr1::bind;
+    using std::tr1::placeholders::_1;
+    using std::tr1::placeholders::_2;
 
     return std::accumulate(neigh.begin(), neigh.end(), 0.0,
                            bind(std::plus<double>(),
@@ -158,18 +186,19 @@ 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!");
+    if (lb_iter == 1)           // warn only once
+        WARN0("process::load_balance() is a no-op!");
     return 0.0;
 }
 
 void process::compute()
 {
     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));
+        double flops = opt::comp_cost(load);
+        m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
+        DEBUG2("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
+        comp += flops;
         MSG_task_destroy(task);
     } else {
         DEBUG0("nothing to compute !");
@@ -218,8 +247,8 @@ void process::send1_bookkeeping(neighbor& nb)
 
 void process::send()
 {
-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
+    using std::tr1::bind;
+    using std::tr1::placeholders::_1;
 
     if (opt::bookkeeping) {
         std::for_each(neigh.begin(), neigh.end(),
@@ -230,16 +259,16 @@ void process::send()
                       bind(&process::send1_no_bookkeeping, this, _1));
         prev_load_broadcast = load;
     }
+    comm.flush(false);
 }
 
-void process::receive(recv_wait_mode wait)
+void process::receive(double timeout)
 {
-    // DEBUG1("go for receive(%s)",
-    //        "NO_WAIT\0WAIT\0\0\0\0WAIT_FOR_CLOSE" + 8 * wait);
     message* msg;
     m_host_t from;
-    bool do_wait = (wait != NO_WAIT);
-    while (may_receive && comm.recv(msg, from, do_wait)) {
+
+    DEBUG2("%sblocking receive (%g)", "\0non-" + !timeout, timeout);
+    while (may_receive() && comm.recv(msg, from, timeout)) {
         switch (msg->get_type()) {
         case message::INFO: {
             neighbor* n = rev_neigh[from];
@@ -257,22 +286,18 @@ void process::receive(recv_wait_mode wait)
             break;
         }
         case message::CTRL_CLOSE:
-            if (--ctrl_close_pending == 1)
-                comm.next_close_on_ctrl_is_last();
-            // DEBUG1("ctrl_close_pending = %d", ctrl_close_pending);
+            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);
+            data_close_pending--;
             close_received = true;
             break;
         }
         delete msg;
-        may_receive = (ctrl_close_pending || data_close_pending);
-        do_wait = (wait == WAIT_FOR_CLOSE);
+        timeout = 0.0;          // only wait on first recv
     }
+    comm.flush(false);
 }
 
 void process::finalize1(neighbor& nb)
@@ -283,28 +308,31 @@ void process::finalize1(neighbor& nb)
 
 void process::finalize()
 {
-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
+    using std::tr1::bind;
+    using std::tr1::placeholders::_1;
 
     finalizing = true;
     total_load_running -= load;
 
-    DEBUG2("send CLOSE to %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
+    DEBUG2("send CLOSE to %lu neighbor%s",
+           (unsigned long )neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
                   bind(&process::finalize1, this, _1));
 
-    DEBUG2("wait for CLOSE from %d neighbor%s.",
-           (int )neigh.size(), ESSE(neigh.size()));
-    receive(WAIT_FOR_CLOSE);
+    DEBUG2("wait for CLOSE from %lu neighbor%s",
+           (unsigned long )neigh.size(), ESSE(neigh.size()));
+    while (may_receive()) {
+        comm.flush(false);
+        receive(-1.0);
+    }
 
     comm.flush(true);
 }
 
 #define print_loads_generic(vec, verbose, logp, cat)                    \
     if (_XBT_LOG_ISENABLEDV((*cat), logp)) {                            \
-        using namespace std::tr1;                                       \
-        using namespace std::tr1::placeholders;                         \
+        using std::tr1::bind;                                           \
+        using std::tr1::placeholders::_1;                               \
         XCLOG0(cat, logp, "Neighbor loads:");                           \
         std::for_each(vec.begin(), vec.end(),                           \
                       bind(&neighbor::print, _1, verbose, logp, cat));  \