Use git diff instead of diff-index for setlocalversion.

[loba.git] / messages.cpp

diff --git a/messages.cpp b/messages.cpp
index 6c9f3ec0402f3c357676f2bd53be29a83207c096..e20c4cac306c95c8fb0557ccf8937579b924f25a 100644 (file)
--- a/messages.cpp
+++ b/messages.cpp
@@ -14,10 +14,10 @@ message::message(message_type t, double a, double c)
     // compute message size
     // arbitrary: 8 for type, and 8 for each double
     switch (type) {
     // compute message size
     // arbitrary: 8 for type, and 8 for each double
     switch (type) {

-    case CTRL:
+    case message_type::CTRL:

         size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
         break;
         size = opt::bookkeeping ? 24 : 16; // type + amount + (credit)?
         break;

-    case DATA:
+    case message_type::DATA:

         size = 16 + opt::comm_cost(amount); // type + amount + data size
         break;
     default:
         size = 16 + opt::comm_cost(amount); // type + amount + data size
         break;
     default:


@@ -30,22 +30,22 @@ std::string message::to_string()
 {
     std::ostringstream oss;
     switch (type) {
 {
     std::ostringstream oss;
     switch (type) {

-    case CTRL:
+    case message_type::CTRL:

         oss << "CTRL: " << amount << " (info)";
         if (opt::bookkeeping)
             oss << "; " << credit << " (credit)";
         break;
         oss << "CTRL: " << amount << " (info)";
         if (opt::bookkeeping)
             oss << "; " << credit << " (credit)";
         break;

-    case DATA:
+    case message_type::DATA:

         oss << "DATA: " << amount << " (load)";
         break;
         oss << "DATA: " << amount << " (load)";
         break;

-    case CTRL_CLOSE:
+    case message_type::CTRL_CLOSE:

         oss << "CTRL_CLOSE";
         break;
         oss << "CTRL_CLOSE";
         break;

-    case DATA_CLOSE:
+    case message_type::DATA_CLOSE:

         oss << "DATA_CLOSE";
         break;
     default:
         oss << "DATA_CLOSE";
         break;
     default:

-        oss << "UNKNOWN MESSAGE TYPE: " << type;
+        oss << "UNKNOWN MESSAGE TYPE: " << static_cast<int>(type);

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


@@ -63,7 +63,7 @@ void message_queue::push(msg_task_t task)
 
 bool message_queue::pop(message*& msg, msg_host_t& from, double timeout)
 {
 
 bool message_queue::pop(message*& msg, msg_host_t& from, double timeout)
 {

-    msg_task_t task;
+    msg_task_t task = nullptr;

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


@@ -71,17 +71,21 @@ bool message_queue::pop(message*& msg, msg_host_t& from, double timeout)
         mutex.acquire();
         if (!queue.try_pop(task)) {
             XBT_DEBUG("waiting for a message to come");
         mutex.acquire();
         if (!queue.try_pop(task)) {
             XBT_DEBUG("waiting for a message to come");

+            bool hit_timeout;

             if (timeout > 0) {
             if (timeout > 0) {

-                if (!cond.timedwait(mutex, timeout))
-                    return false;
+                hit_timeout = !cond.timedwait(mutex, timeout);

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

+                hit_timeout = false;

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

-            xbt_assert(pop_was_successful);
+            xbt_assert(hit_timeout || pop_was_successful);

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

+    if (task == nullptr)
+        return false;
+

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