Fix build with SimGrid 3.12.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 0abf913987782ce2399d3f9285c20235c45135d6..70e2236198839f8d53a56b918483646658b7fe66 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -4,55 +4,88 @@
 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" };

     std::ostringstream oss;
     std::ostringstream oss;

-    oss << str[type] << ": " << amount;
+    switch (type) {
+    case CTRL:
+        oss << "CTRL: " << amount << " (info)";
+        if (opt::bookkeeping)
+            oss << "; " << credit << " (credit)";
+        break;
+    case DATA:
+        oss << "DATA: " << amount << " (load)";
+        break;
+    case CTRL_CLOSE:
+        oss << "CTRL_CLOSE";
+        break;
+    case DATA_CLOSE:
+        oss << "DATA_CLOSE";
+        break;
+    default:
+        oss << "UNKNOWN MESSAGE TYPE: " << type;
+        break;
+    }

     return oss.str();
 }
 
     return oss.str();
 }
 

-void message_queue::push(m_task_t task)
+void message_queue::push(msg_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, msg_host_t& from, double timeout)

 {
 {

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

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

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

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

-            TRY {
-                if (deadline)
-                    cond.timedwait(mutex, deadline - MSG_get_clock());
-                else
-                    cond.wait(mutex);
-            }
-            CATCH (e) {
-                if (e.category != timeout_error)
-                    RETHROW;
-                xbt_ex_free(e);
+            bool hit_timeout;
+            if (timeout > 0) {
+                hit_timeout = !cond.timedwait(mutex, timeout);
+            } else {
+                cond.wait(mutex);
+                hit_timeout = false;

             }
             }

+            bool pop_was_successful = queue.try_pop(task);
+            xbt_assert(hit_timeout || pop_was_successful);

         }
         mutex.release();
     }
         }
         mutex.release();
     }

-
-    if (queue.empty())
+    if (task == nullptr)

         return false;
 
         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);