Use a lock-free synchronized queue for the message queue.

diff --git a/messages.cpp b/messages.cpp
index f5df3969b38db3d09707f097e93370aaa19dbcb3..025871a12f8f1e4bce39d3674108bee40e9dbed1 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -28,41 +28,46 @@ double message::get_size() const
 
 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);

diff --git a/messages.h b/messages.h
index 605b3be1e42282fa87bf5ac5cdb3cf5a6f9bd292..8de464ab8f390cb4fb77cc4a647b05f4d5e864e3 100644 (file)
--- a/messages.h
+++ b/messages.h
@@ -5,6 +5,7 @@
 #include <string>
 #include <msg/msg.h>
 #include "synchro.h"
 #include <string>
 #include <msg/msg.h>
 #include "synchro.h"

+#include "sync_queue.h"

 
 class message {
 public:
 
 class message {
 public:


@@ -39,7 +40,7 @@ public:
 private:
     mutex_t mutex;
     condition_t cond;
 private:
     mutex_t mutex;
     condition_t cond;

-    std::queue<m_task_t> queue;
+    sync_queue<m_task_t> queue;

 };
 
 #endif // !MESSAGES_H
 };
 
 #endif // !MESSAGES_H