X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/ef1ef576d25c492dc585240b8a4b36954fc00140..8bdfda4ed37966fcac00b37ddca740afaba48b28:/process.cpp

diff --git a/process.cpp b/process.cpp
index 0b27f0b..99bd039 100644
--- a/process.cpp
+++ b/process.cpp
@@ -39,16 +39,8 @@ process::process(int argc, char* argv[])
     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,10 +65,21 @@ process::~process()
 
 int process::run()
 {
+    double next_iter_after_date = 0.0;
     INFO1("Initial load: %g", load);
     VERB0("Starting...");
     comp_iter = lb_iter = 0;
     while (true) {
+        if (opt::min_iter_duration) {
+            double now = MSG_get_clock();
+            if (now < next_iter_after_date){
+                double delay = next_iter_after_date - now;
+                DEBUG1("sleeping for %g s", delay);
+                MSG_process_sleep(next_iter_after_date - now);
+            }
+            next_iter_after_date = MSG_get_clock() + opt::min_iter_duration;
+        }
+
         if (load > 0.0) {
             ++comp_iter;
             if (opt::log_rate && comp_iter % opt::log_rate == 0) {
@@ -107,21 +110,24 @@ int process::run()
             break;
         if (opt::lb_maxiter && lb_iter >= opt::lb_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);
+        bool wait = (load == 0 &&
+                     ((opt::bookkeeping ? expected_load : load)
+                      == prev_load_broadcast));
+        receive(wait);
 
         // one of our neighbor is finalizing
         if (opt::exit_on_close && close_received)
             break;
 
         // have no load and cannot receive anything
-        if (load == 0.0 && !may_receive)
+        if (load == 0.0 && !may_receive())
             break;
 
         // fixme: this check should be implemented with a distributed
@@ -165,7 +171,7 @@ double process::sum_of_to_send() const
 double process::load_balance(double /*my_load*/)
 {
     if (lb_iter == 1)           // warn only once
-        WARN0("process::load_balance is a no-op!");
+        WARN0("process::load_balance() is a no-op!");
     return 0.0;
 }
 
@@ -174,7 +180,7 @@ 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));
+        DEBUG2("compute %g flop%s", duration, ESSE(duration));
         MSG_task_execute(task);
         MSG_task_destroy(task);
     } else {
@@ -236,16 +242,15 @@ 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(bool wait)
 {
-    // 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)) {
+
+    while (may_receive() && comm.recv(msg, from, wait)) {
         switch (msg->get_type()) {
         case message::INFO: {
             neighbor* n = rev_neigh[from];
@@ -263,22 +268,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);
+        wait = false;           // only wait on first recv
     }
+    comm.flush(false);
 }
 
 void process::finalize1(neighbor& nb)
@@ -295,14 +296,17 @@ void process::finalize()
     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(true);
+    }
 
     comm.flush(true);
 }