Handle timeout exception in condition_t::timedwait().

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index fd19f6b979657881f082d09e7bc0ea8a480a3ac2..6c9f3ec0402f3c357676f2bd53be29a83207c096 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -28,14 +28,30 @@ message::message(message_type t, double a, double c)
 
 std::string message::to_string()
 {
 
 std::string message::to_string()
 {

-    static const char* str[DATA_CLOSE + 1] = { "CTRL", "DATA",
-                                               "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)

 {
     if (queue.push(task)) {
          // list was empty, the push must be signaled
 {
     if (queue.push(task)) {
          // list was empty, the push must be signaled


@@ -45,37 +61,26 @@ void message_queue::push(m_task_t task)
     }
 }
 
     }
 }
 

-bool message_queue::pop(message*& msg, m_host_t& from, double timeout)
+bool message_queue::pop(message*& msg, msg_host_t& from, double timeout)

 {
 {

-    m_task_t task;
+    msg_task_t task;

     if (!queue.try_pop(task)) {
         if (timeout == 0.0)
             return false;
 
         mutex.acquire();
         if (!queue.try_pop(task)) {
     if (!queue.try_pop(task)) {
         if (timeout == 0.0)
             return false;
 
         mutex.acquire();
         if (!queue.try_pop(task)) {

-            xbt_ex_t e;

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

-            TRY {
-                if (timeout > 0)
-                    cond.timedwait(mutex, timeout);
-                else
-                    cond.wait(mutex);
-            }
-            TRY_CLEANUP {
-                mutex.release();
-            }
-            CATCH (e) {
-                if (e.category != timeout_error)
-                    RETHROW;
-                xbt_ex_free(e);
-                return false;   // got a timeout
+            if (timeout > 0) {
+                if (!cond.timedwait(mutex, timeout))
+                    return false;
+            } else {
+                cond.wait(mutex);

             }
             bool pop_was_successful = queue.try_pop(task);
             xbt_assert(pop_was_successful);
             }
             bool pop_was_successful = queue.try_pop(task);
             xbt_assert(pop_was_successful);

-        } else {
-            mutex.release();

         }
         }

+        mutex.release();

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