Define process::print_loads_p() to print loads by using neighp[]

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 9988defd083267ef8c197feb47465a8d59a97ee8..214b9d05a785d80edeb436f14466a6d8140545d9 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -1,5 +1,3 @@
-#include "process.h"
-

 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>
 #include <algorithm>
 #include <tr1/functional>
 #include <iterator>


@@ -8,29 +6,34 @@
 #include <sstream>
 #include <xbt/log.h>
 #include <xbt/time.h>
 #include <sstream>
 #include <xbt/log.h>
 #include <xbt/time.h>

+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
+

 #include "misc.h"
 #include "options.h"
 
 #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[])
 {
 
 process::process(int argc, char* argv[])
 {

-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
-

     if (argc < 2 || !(std::istringstream(argv[1]) >> load))
     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(),
-                  bind(&process::insert_neighbor_in_map, this, _1));
-
-    pneigh.resize(neigh.size());
-    std::transform(neigh.begin(), neigh.end(), pneigh.begin(),
-                   misc::address<neighbor>());
+    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) {


@@ -49,27 +52,27 @@ process::process(int argc, char* argv[])
         oss << ESSE(neigh.size()) << ": ";
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),
         oss << ESSE(neigh.size()) << ": ";
         std::transform(neigh.begin(), neigh.end() - 1,
                        std::ostream_iterator<const char*>(oss, ", "),

-                       mem_fn(&neighbor::get_name));
+                       std::tr1::mem_fn(&neighbor::get_name));

         oss << neigh.back().get_name();
     }
     LOG1(logp, "Got %s.", oss.str().c_str());
         oss << neigh.back().get_name();
     }
     LOG1(logp, "Got %s.", oss.str().c_str());

-    print_loads(logp);
+    print_loads(true, logp);

 }
 
 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
-    send();
+    // 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) {


@@ -80,10 +83,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(true, xbt_log_priority_debug);

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


@@ -91,12 +91,31 @@ int process::run()
             load -= load_balance(load);
 
         send();
             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)
+        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();
 


@@ -107,11 +126,9 @@ 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;
 }
 


@@ -127,27 +144,28 @@ double process::sum_of_to_send() const
 
 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;
 }
 
 void process::compute()
 {
     return 0.0;
 }
 
 void process::compute()
 {

-    // fixme: shall we do something special when duration is 0 ?
-    double duration = opt::comp_cost(load);
-    if (duration > 0)  {
+    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 {
         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 {

-        xbt_sleep(42);
-        //        xbt_thread_yield();
+        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));


@@ -157,7 +175,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();


@@ -187,25 +207,26 @@ void process::send()
     using namespace std::tr1;
     using namespace std::tr1::placeholders;
 
     using namespace std::tr1;
     using namespace std::tr1::placeholders;
 

-    // fixme: shall we send data at all iterations?
-    if (opt::bookkeeping)
+    if (opt::bookkeeping) {

         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::send1_bookkeeping, this, _1));
         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::send1_bookkeeping, this, _1));

-    else
+        prev_load_broadcast = expected_load;
+    } else {

         std::for_each(neigh.begin(), neigh.end(),
                       bind(&process::send1_no_bookkeeping, this, _1));
         std::for_each(neigh.begin(), neigh.end(),
                       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];


@@ -232,6 +253,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;
 }


@@ -254,35 +277,36 @@ void process::finalize()
 
     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);
 }
 

-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;
-
-    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());
+    print_loads_generic(neigh, verbose, logp, cat);

 }
 
 }
 

-void process::insert_neighbor_in_map(neighbor& nb)
+void process::print_loads_p(bool verbose,
+                            e_xbt_log_priority_t logp,
+                            xbt_log_category_t cat) const

 {
 {

-    neighbor* nbp = &nb;
-    m_host_t host = MSG_get_host_by_name(nb.get_name());
-    rev_neigh.insert(std::make_pair(host, nbp));
+    print_loads_generic(pneigh, verbose, logp, cat);

 }
 
 }
 

+#undef print_loads_generic
+

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