Merge branch 'master' of ssh://info.iut-bm.univ-fcomte.fr/loba

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 0abf913987782ce2399d3f9285c20235c45135d6..fd19f6b979657881f082d09e7bc0ea8a480a3ac2 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -4,13 +4,32 @@
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(comm);
 
 #include "misc.h"

+#include "options.h"

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

+message::message(message_type t, double a, double c)
+    : type(t), amount(a) , credit(c)
+{
+    // compute message size
+    // arbitrary: 8 for type, and 8 for each double
+    switch (type) {
+    case CTRL:
+        size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
+        break;
+    case DATA:
+        size = 16 + opt::comm_cost(amount); // type + amount + data size
+        break;
+    default:
+        size = 8;               // type
+        break;
+    }
+}
+

 std::string message::to_string()
 {
 std::string message::to_string()
 {

-    static const char* str[] = { "INFO", "CREDIT", "LOAD",
-                                 "CTRL_CLOSE", "DATA_CLOSE" };
+    static const char* str[DATA_CLOSE + 1] = { "CTRL", "DATA",
+                                               "CTRL_CLOSE", "DATA_CLOSE" };

     std::ostringstream oss;
     oss << str[type] << ": " << amount;
     return oss.str();
     std::ostringstream oss;
     oss << str[type] << ": " << amount;
     return oss.str();


@@ -18,41 +37,46 @@ std::string message::to_string()
 
 void message_queue::push(m_task_t task)
 {
 
 void message_queue::push(m_task_t task)
 {

-    mutex.acquire();
-    queue.push(task);
-    cond.signal();
-    mutex.release();
+    if (queue.push(task)) {
+         // list was empty, the push must be signaled
+        mutex.acquire();
+        cond.signal();
+        mutex.release();
+    }

 }
 
 bool message_queue::pop(message*& msg, m_host_t& from, double timeout)
 {
 }
 
 bool message_queue::pop(message*& msg, m_host_t& from, double timeout)
 {

-    if (timeout != 0) {
-        volatile double deadline =
-            timeout > 0 ? MSG_get_clock() + timeout : 0.0;
+    m_task_t task;
+    if (!queue.try_pop(task)) {
+        if (timeout == 0.0)
+            return false;
+

         mutex.acquire();
         mutex.acquire();

-        while (queue.empty() && (!deadline || deadline > MSG_get_clock())) {
+        if (!queue.try_pop(task)) {

             xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");
             TRY {
             xbt_ex_t e;
             XBT_DEBUG("waiting for a message to come");
             TRY {

-                if (deadline)
-                    cond.timedwait(mutex, deadline - MSG_get_clock());
+                if (timeout > 0)
+                    cond.timedwait(mutex, timeout);

                 else
                     cond.wait(mutex);
             }
                 else
                     cond.wait(mutex);
             }

+            TRY_CLEANUP {
+                mutex.release();
+            }

             CATCH (e) {
                 if (e.category != timeout_error)
                     RETHROW;
                 xbt_ex_free(e);
             CATCH (e) {
                 if (e.category != timeout_error)
                     RETHROW;
                 xbt_ex_free(e);

+                return false;   // got a timeout

             }
             }

+            bool pop_was_successful = queue.try_pop(task);
+            xbt_assert(pop_was_successful);
+        } else {
+            mutex.release();

         }
         }

-        mutex.release();

     }
     }

-
-    if (queue.empty())
-        return false;
-
-    m_task_t task = queue.front();
-    queue.pop();

     msg = static_cast<message*>(MSG_task_get_data(task));
     from = MSG_task_get_source(task);
     MSG_task_destroy(task);
     msg = static_cast<message*>(MSG_task_get_data(task));
     from = MSG_task_get_source(task);
     MSG_task_destroy(task);