Wip++...

* debug (first try...)

diff --git a/communicator.cpp b/communicator.cpp
index f3de918962815d0c0822fc6aa9f42f7b1b767390..83935155dfce1308c380ab567eb80c929698c0a7 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -5,7 +5,6 @@
 #include <sstream>
 #include <msg/msg.h>
 #include <xbt/log.h>
-#include "simgrid_features.h"
 #include "misc.h"
 #include "options.h"
 
@@ -53,6 +52,7 @@ void communicator::listen()
 
 void communicator::send(const char* dest, message* msg)
 {
+    DEBUG2("send %s to %s", msg->to_string().c_str(), dest);
     double msg_size = sizeof *msg;
     if (msg->get_type() == message::LOAD)
         msg_size += opt::comm_cost(msg->get_amount());
@@ -105,6 +105,10 @@ bool communicator::recv(message*& msg, m_host_t& from, bool wait)
         }
     } while (restart);
 
+    if (msg)
+        DEBUG2("received %s from %s",
+               msg->to_string().c_str(), MSG_host_get_name(from));
+
     return msg != NULL;
 }
 

diff --git a/main.cpp b/main.cpp
index a40bb9fa1e11fe26a7ec4898898bcbd8ab655633..a4e9fdb054c8e476d6f277b77689e6348c68eacb 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -30,9 +30,11 @@ enum {
 #include "loba_least_loaded.h"
 int simulation_main(int argc, char* argv[])
 {
-    //    process proc(argc, argv);
-    loba_least_loaded proc(argc, argv);
-    return proc.run();
+    int result;
+    process* proc = new loba_least_loaded(argc, argv);
+    result = proc->run();
+    delete proc;
+    return result;
 }
 
 int main(int argc, char* argv[])

diff --git a/process.cpp b/process.cpp
index 9988defd083267ef8c197feb47465a8d59a97ee8..339938a703df6b4215fb45e04c9b02049fcc5016 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -15,20 +15,18 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 
 process::process(int argc, char* argv[])
 {
-    using namespace std::tr1;
-    using namespace std::tr1::placeholders;
-
     if (argc < 2 || !(std::istringstream(argv[1]) >> load))
         throw std::invalid_argument("bad or missing initial load");
 
     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;
 
@@ -49,7 +47,7 @@ process::process(int argc, char* argv[])
         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());
@@ -66,12 +64,11 @@ int process::run()
 
     INFO1("Initial load: %g", load);
     VERB0("Starting...");
-    // first send to inform neighbors about our load
+    // first send() to inform neighbors about our load (force it)
+    prev_load_broadcast = !(opt::bookkeeping? expected_load: load);
     send();
     iter = 0;
     while (one_more) {
-        ++iter;
-
         if (opt::log_rate && iter % opt::log_rate == 0) {
             if (opt::bookkeeping)
                 INFO3("(%u) current load: %g ; expected: %g",
@@ -80,10 +77,15 @@ int process::run()
                 INFO2("(%u) current load: %g",
                       iter, load);
         }
+        print_loads(xbt_log_priority_debug);
 
-        compute();
+        bool do_compute = load > 0.0;
+        if (do_compute) {
+            compute();
+            ++iter;
+        }
 
-        bool close_received = !receive(false);
+        bool close_received = !receive(do_compute? NO_WAIT: WAIT);
 
         if (opt::bookkeeping)
             expected_load -= load_balance(expected_load);
@@ -132,22 +134,17 @@ double process::load_balance(double /*my_load*/)
 
 void process::compute()
 {
-    // fixme: shall we do something special when duration is 0 ?
     double duration = opt::comp_cost(load);
-    if (duration > 0)  {
-        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();
-    }
+    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);
 }
 
 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));
@@ -157,7 +154,9 @@ void process::send1_no_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();
@@ -188,24 +187,25 @@ void process::send()
     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));
-    else
+        prev_load_broadcast = expected_load;
+    } else {
         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)
 {
     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];
@@ -232,6 +232,8 @@ bool process::receive(bool wait_for_close)
             break;
         }
         delete msg;
+        do_recv = (wait == WAIT_FOR_CLOSE) &&
+            (ctrl_close_pending || data_close_pending);
     }
     return result;
 }
@@ -254,7 +256,7 @@ void process::finalize()
 
     DEBUG2("wait for CLOSE from %d neighbor%s.",
            (int )neigh.size(), ESSE(neigh.size()));
-    receive(true);
+    receive(WAIT_FOR_CLOSE);
 
     comm.flush(true);
 }
@@ -276,13 +278,6 @@ void process::print_loads(e_xbt_log_priority_t logp)
     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:

diff --git a/process.h b/process.h
index c148683bca8764e145344c98d8900563f80dac1f..607a6af130e1dc330f555d4b5b23edc45eea8c24 100644 (file)
--- a/process.h
+++ b/process.h
@@ -31,6 +31,7 @@ protected:
 
 private:
     typedef MAP_TEMPLATE<m_host_t, neighbor*> rev_neigh_type;
+    enum recv_wait_mode { NO_WAIT = 0, WAIT, WAIT_FOR_CLOSE };
 
     rev_neigh_type rev_neigh;
 
@@ -40,6 +41,7 @@ private:
 
     unsigned iter;
 
+    double prev_load_broadcast;
     double load;
     double expected_load;
 
@@ -50,12 +52,10 @@ private:
     void send1_no_bookkeeping(neighbor& nb);
     void send1_bookkeeping(neighbor& nb);
     void send();
-    bool receive(bool wait_for_close);
+    bool receive(recv_wait_mode wait);
     void finalize1(neighbor& nb);
     void finalize();
     void print_loads(e_xbt_log_priority_t logp = xbt_log_priority_info);
-
-    void insert_neighbor_in_map(neighbor& nb);
 };
 
 #endif // !PROCESS_H