Account for elapsed (wall clock) time too.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 2fa48618e64cc28116b666ba8f451e7ef9fb5b9d..f5df3969b38db3d09707f097e93370aaa19dbcb3 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -1,4 +1,10 @@
 #include <sstream>
 #include <sstream>

+#include <xbt/log.h>
+
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
+
+#include "misc.h"
+#include "options.h"

 
 #include "messages.h"
 
 
 #include "messages.h"
 


@@ -11,6 +17,15 @@ std::string message::to_string()
     return oss.str();
 }
 
     return oss.str();
 }
 

+double message::get_size() const
+{
+    // arbitrary: 8 for type, and 8 for amount
+    double size = 16;
+    if (type == LOAD)
+        size += opt::comm_cost(amount);
+    return size;
+}
+

 void message_queue::push(m_task_t task)
 {
     mutex.acquire();
 void message_queue::push(m_task_t task)
 {
     mutex.acquire();


@@ -27,6 +42,7 @@ bool message_queue::pop(message*& msg, m_host_t& from, double timeout)
         mutex.acquire();
         while (queue.empty() && (!deadline || deadline > MSG_get_clock())) {
             xbt_ex_t e;
         mutex.acquire();
         while (queue.empty() && (!deadline || deadline > MSG_get_clock())) {
             xbt_ex_t e;

+            XBT_DEBUG("waiting for a message to come");

             TRY {
                 if (deadline)
                     cond.timedwait(mutex, deadline - MSG_get_clock());
             TRY {
                 if (deadline)
                     cond.timedwait(mutex, deadline - MSG_get_clock());


@@ -51,5 +67,8 @@ bool message_queue::pop(message*& msg, m_host_t& from, double timeout)
     from = MSG_task_get_source(task);
     MSG_task_destroy(task);
 
     from = MSG_task_get_source(task);
     MSG_task_destroy(task);
 

+    XBT_DEBUG("received %s from %s",
+              msg->to_string().c_str(), MSG_host_get_name(from));
+

     return true;
 }
     return true;
 }