Handle timeout exception in condition_t::timedwait().

[loba.git] / process.cpp

diff --git a/process.cpp b/process.cpp
index 97f2a69db2e943c01bfdb6e9187856aa073db947..3413931f058c1603994fbfa1ece1da06ebb542ca 100644 (file)
--- a/process.cpp
+++ b/process.cpp
@@ -6,7 +6,6 @@
 #include <stdexcept>
 #include <sstream>
 #include <xbt/log.h>
-#include <xbt/time.h>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(proc);
 
@@ -58,7 +57,7 @@ process::process(int argc, char* argv[])
     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());
+        msg_host_t host = MSG_get_host_by_name(ptr->get_name());
         pneigh.push_back(ptr);
         rev_neigh.insert(std::make_pair(host, ptr));
     }
@@ -256,8 +255,8 @@ void process::compute_loop()
         idle_duration += MSG_get_clock() - idle_since_date;
         ++comp_iter;
         double flops = opt::comp_cost(real_load);
-        m_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
-        TRACE_msg_set_task_category(task, TRACE_CAT_COMP);
+        msg_task_t task = MSG_task_create("computation", flops, 0.0, NULL);
+        // MSG_task_set_category(task, TRACE_CAT_COMP);
         XBT_DEBUG("compute %g flop%s", flops, ESSE(flops));
         MSG_task_execute(task);
         add_comp_amount(flops);
@@ -421,7 +420,11 @@ void process::data_send(neighbor& nb)
         else
             excess_load = real_load;
 
-        double balance = nb.get_debt() - nb.get_credit();
+        double balance;
+        if (nb.get_credit() > 0.0)
+            balance = nb.get_debt() - nb.get_credit();
+        else
+            balance = nb.get_debt();
         load_to_send = std::min(excess_load,
                                 std::max(0.0, balance));
 
@@ -461,7 +464,7 @@ void process::data_close(neighbor& nb)
 void process::ctrl_receive(double timeout)
 {
     message* msg;
-    m_host_t from;
+    msg_host_t from;
 
     XBT_DEBUG("%sblocking receive on ctrl (%g)", "\0non-" + !timeout, timeout);
     while (ctrl_close_pending && comm.ctrl_recv(msg, from, timeout)) {
@@ -475,7 +478,7 @@ void process::ctrl_receive(double timeout)
 void process::data_receive(double timeout)
 {
     message* msg;
-    m_host_t from;
+    msg_host_t from;
 
     XBT_DEBUG("%sblocking receive on data (%g)", "\0non-" + !timeout, timeout);
     while (data_close_pending && comm.data_recv(msg, from, timeout)) {
@@ -486,7 +489,7 @@ void process::data_receive(double timeout)
     }
 }
 
-void process::handle_message(message* msg, m_host_t from)
+void process::handle_message(message* msg, msg_host_t from)
 {
     switch (msg->get_type()) {
     case message::CTRL: {