Add option "-v" (verbose).

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index e1232f2ac59640923e46f1c5f5f0b627ca0055c8..1556f3c4f8ba72df25c2ab9a98f3bfc09e0c42e7 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -3,6 +3,7 @@
 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>
 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>

+#include <numeric>

 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>
 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>


@@ -10,20 +11,28 @@
 #include "misc.h"
 #include "options.h"
 
 #include "misc.h"
 #include "options.h"
 

-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simu);
+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))
 
 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);
 
 
     neigh.assign(argv + 2, argv + argc);
 

-    std::for_each(neigh.begin(), neigh.end(),
-                  std::tr1::bind(&process::insert_neighbor_in_map,
-                                 this, std::tr1::placeholders::_1));
+    pneigh.reserve(neigh.size());
+    for (unsigned i = 0 ; i < neigh.size() ; i++) {
+        neighbor* ptr = &neigh[i];
+        m_host_t host = MSG_get_host_by_name(ptr->get_name());
+        pneigh.push_back(ptr);
+        rev_neigh.insert(std::make_pair(host, ptr));
+    }

 
     expected_load = load;
 
     expected_load = load;

+    total_load_init += load;

 
     ctrl_close_pending = data_close_pending = neigh.size();
     if (neigh.size() == 1) {
 
     ctrl_close_pending = data_close_pending = neigh.size();
     if (neigh.size() == 1) {


@@ -51,16 +60,18 @@ process::process(int argc, char* argv[])
 
 process::~process()
 {
 
 process::~process()
 {

+    total_load_exit += load;

 }
 
 int process::run()
 {
 }
 
 int process::run()
 {

-    bool one_more = true;
-

     INFO1("Initial load: %g", load);
     VERB0("Starting...");
     INFO1("Initial load: %g", load);
     VERB0("Starting...");

+    // first send() to inform neighbors about our load (force it)
+    prev_load_broadcast = -1;

     iter = 0;
     iter = 0;

-    while (one_more) {
+    bool one_more = true;
+    do {

         ++iter;
 
         if (opt::log_rate && iter % opt::log_rate == 0) {
         ++iter;
 
         if (opt::log_rate && iter % opt::log_rate == 0) {


@@ -71,10 +82,7 @@ int process::run()
                 INFO2("(%u) current load: %g",
                       iter, load);
         }
                 INFO2("(%u) current load: %g",
                       iter, load);
         }

-
-        compute();
-
-        bool close_received = !receive(false);
+        print_loads(xbt_log_priority_debug);

 
         if (opt::bookkeeping)
             expected_load -= load_balance(expected_load);
 
         if (opt::bookkeeping)
             expected_load -= load_balance(expected_load);


@@ -82,13 +90,31 @@ int process::run()
             load -= load_balance(load);
 
         send();
             load -= load_balance(load);
 
         send();

-        comm.flush(false);
+        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();
 
     VERB0("Going to finalize...");
     finalize();
 


@@ -99,32 +125,46 @@ int process::run()
      */
 
     VERB0("Done.");
      */
 
     VERB0("Done.");

+    INFO3("Final load after %d iteration%s: %g", iter, ESSE(iter), load);

     if (opt::bookkeeping)
     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;
 }
 
     return 0;
 }
 

-void process::compute()
+double process::sum_of_to_send() const

 {
 {

-    // fixme: shall we do something special when duration is 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);
+    using namespace std::tr1;
+    using namespace std::tr1::placeholders;
+
+    return std::accumulate(neigh.begin(), neigh.end(), 0.0,
+                           bind(std::plus<double>(),
+                                _1, bind(&neighbor::get_to_send, _2)));

 }
 
 double process::load_balance(double /*my_load*/)
 {
 }
 
 double process::load_balance(double /*my_load*/)
 {

+    if (iter == 1)
+        WARN0("process::load_balance is a no-op!");

     return 0.0;
 }
 
     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));
+        MSG_task_execute(task);
+        MSG_task_destroy(task);
+    } else {
+        DEBUG0("nothing to compute !");
+    }
+}
+

 void process::send1_no_bookkeeping(neighbor& nb)
 {
 void process::send1_no_bookkeeping(neighbor& nb)
 {

-    comm.send(nb.get_ctrl_mbox(), new message(message::INFO, load));
+    if (load != prev_load_broadcast)
+        comm.send(nb.get_ctrl_mbox(), new message(message::INFO, load));

     double load_to_send = nb.get_to_send();
     if (load_to_send > 0.0) {
         comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));
     double load_to_send = nb.get_to_send();
     if (load_to_send > 0.0) {
         comm.send(nb.get_data_mbox(), new message(message::LOAD, load_to_send));


@@ -134,7 +174,9 @@ void process::send1_no_bookkeeping(neighbor& nb)
 
 void process::send1_bookkeeping(neighbor& nb)
 {
 
 void process::send1_bookkeeping(neighbor& nb)
 {

-    comm.send(nb.get_ctrl_mbox(), new message(message::INFO, expected_load));
+    if (expected_load != prev_load_broadcast)
+        comm.send(nb.get_ctrl_mbox(),
+                  new message(message::INFO, expected_load));

     double load_to_send;
     double new_debt;
     double debt_to_send = nb.get_to_send();
     double load_to_send;
     double new_debt;
     double debt_to_send = nb.get_to_send();


@@ -161,28 +203,29 @@ void process::send1_bookkeeping(neighbor& nb)
 
 void process::send()
 {
 
 void process::send()
 {

-    // fixme: shall we send data at all iterations?
+    using namespace std::tr1;
+    using namespace std::tr1::placeholders;
+

     if (opt::bookkeeping) {
         std::for_each(neigh.begin(), neigh.end(),
     if (opt::bookkeeping) {
         std::for_each(neigh.begin(), neigh.end(),

-                      std::tr1::bind(&process::send1_bookkeeping,
-                                     this, std::tr1::placeholders::_1));
+                      bind(&process::send1_bookkeeping, this, _1));
+        prev_load_broadcast = expected_load;

     } else {
         std::for_each(neigh.begin(), neigh.end(),
     } else {
         std::for_each(neigh.begin(), neigh.end(),

-                      std::tr1::bind(&process::send1_no_bookkeeping,
-                                     this, std::tr1::placeholders::_1));
+                      bind(&process::send1_no_bookkeeping, this, _1));
+        prev_load_broadcast = load;

     }
 }
 
     }
 }
 

-// Returns false if a CLOSE message was received. 
-bool process::receive(bool wait_for_close)
+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;
     bool result = true;
     message* msg;
     m_host_t from;

-    while ((ctrl_close_pending ||
-            data_close_pending) && comm.recv(msg, from, wait_for_close)) {
-        DEBUG2("received %s from %s",
-               msg->to_string().c_str(), MSG_host_get_name(from));
+    bool do_recv = ctrl_close_pending || data_close_pending;
+    while (do_recv && comm.recv(msg, from, wait)) {

         switch (msg->get_type()) {
         case message::INFO: {
             neighbor* n = rev_neigh[from];
         switch (msg->get_type()) {
         case message::INFO: {
             neighbor* n = rev_neigh[from];


@@ -209,6 +252,8 @@ bool process::receive(bool wait_for_close)
             break;
         }
         delete msg;
             break;
         }
         delete msg;

+        do_recv = (wait == WAIT_FOR_CLOSE) &&
+            (ctrl_close_pending || data_close_pending);

     }
     return result;
 }
     }
     return result;
 }


@@ -221,15 +266,17 @@ void process::finalize1(neighbor& nb)
 
 void process::finalize()
 {
 
 void process::finalize()
 {

+    using namespace std::tr1;
+    using namespace std::tr1::placeholders;
+

     DEBUG2("send CLOSE to %d neighbor%s.",
            (int )neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),
     DEBUG2("send CLOSE to %d neighbor%s.",
            (int )neigh.size(), ESSE(neigh.size()));
     std::for_each(neigh.begin(), neigh.end(),

-                  std::tr1::bind(&process::finalize1,
-                                 this, std::tr1::placeholders::_1));
+                  bind(&process::finalize1, this, _1));

 
     DEBUG2("wait for CLOSE from %d neighbor%s.",
            (int )neigh.size(), ESSE(neigh.size()));
 
     DEBUG2("wait for CLOSE from %d neighbor%s.",
            (int )neigh.size(), ESSE(neigh.size()));

-    receive(true);
+    receive(WAIT_FOR_CLOSE);

 
     comm.flush(true);
 }
 
     comm.flush(true);
 }


@@ -251,13 +298,6 @@ void process::print_loads(e_xbt_log_priority_t logp)
     LOG1(logp, "Neighbor loads: %s", oss.str().c_str());
 }
 
     LOG1(logp, "Neighbor loads: %s", oss.str().c_str());
 }
 

-void process::insert_neighbor_in_map(neighbor& nb)
-{
-    neighbor* nbp = &nb;
-    m_host_t host = MSG_get_host_by_name(nb.get_name());
-    rev_neigh.insert(std::make_pair(host, nbp));
-}
-

 // Local variables:
 // mode: c++
 // End:
 // Local variables:
 // mode: c++
 // End: