Rename process::send() -> process::send_all().

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 0544b21d9e5b62b08a6a09a25618386913c0d377..a0447de98c2f582b4c21dd3adec00597973414a4 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -11,6 +11,7 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 
 #include "misc.h"
 #include "options.h"
+#include "tracing.h"
 
 #include "process.h"
 
@@ -35,7 +36,7 @@ process::process(int argc, char* argv[])
 
     comp = 0.0;
 
-    prev_load_broadcast = -1;   // force sending of load on first send()
+    prev_load_broadcast = -1;   // force sending of load on first send_all()
     expected_load = load;
     total_load_running += load;
     total_load_init += load;
@@ -63,6 +64,17 @@ process::process(int argc, char* argv[])
 process::~process()
 {
     total_load_exit += 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);
+    }
+    VERB1("Total computation for this process: %g", comp);
 }
 
 int process::run()
@@ -72,18 +84,13 @@ int process::run()
     VERB0("Starting...");
     comp_iter = lb_iter = 0;
     while (true) {
-        if (opt::min_iter_duration) {
+        double ld = lb_load();
+        if (ld > 0.0) {
             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(delay);
-            }
+            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;
-        }
 
-        double ld = lb_load();
-        if (ld > 0.0) {
             ++lb_iter;
 
             if (opt::log_rate && lb_iter % opt::log_rate == 0) {
@@ -102,7 +109,7 @@ int process::run()
         lb_load() = ld;
 
         // send load information, and load (data) if any
-        send();
+        send_all();
         if (load > 0.0) {
             ++comp_iter;
             compute();
@@ -123,8 +130,14 @@ int process::run()
 
         // block on receiving unless there is something to compute or
         // to send
-        bool wait = (load == 0 && lb_load() == prev_load_broadcast);
-        receive(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) {
@@ -159,16 +172,6 @@ int process::run()
      */
 
     VERB0("Done.");
-    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;
 }
 
@@ -195,6 +198,7 @@ void process::compute()
     if (load > 0.0) {
         double flops = opt::comp_cost(load);
         m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
+        TRACE_msg_set_task_category(task, TRACE_CAT_COMP);
         DEBUG2("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
         comp += flops;
@@ -244,7 +248,7 @@ void process::send1_bookkeeping(neighbor& nb)
         comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));
 }
 
-void process::send()
+void process::send_all()
 {
     using std::tr1::bind;
     using std::tr1::placeholders::_1;
@@ -261,13 +265,13 @@ void process::send()
     comm.flush(false);
 }
 
-void process::receive(bool wait)
+void process::receive(double timeout)
 {
     message* msg;
     m_host_t from;
 
-    DEBUG1("%sblocking receive", "\0non-" + !wait);
-    while (may_receive() && comm.recv(msg, from, 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];
@@ -294,7 +298,7 @@ void process::receive(bool wait)
             break;
         }
         delete msg;
-        wait = false;           // only wait on first recv
+        timeout = 0.0;          // only wait on first recv
     }
     comm.flush(false);
 }
@@ -322,7 +326,7 @@ void process::finalize()
            (unsigned long )neigh.size(), ESSE(neigh.size()));
     while (may_receive()) {
         comm.flush(false);
-        receive(true);
+        receive(-1.0);
     }
 
     comm.flush(true);