Bug fix: we really need to consume all messages in proc::receive!

[loba.git] / communicator.cpp

diff --git a/communicator.cpp b/communicator.cpp
index 94cdb04160337353a0a1bab8b2797d88c0ce415d..0f9bc7eabb8cac225cf4acf9b0cfff85bc161ae9 100644 (file)
--- a/communicator.cpp
+++ b/communicator.cpp
@@ -21,7 +21,7 @@ std::string message::to_string()
     return oss.str();
 }
 
     return oss.str();
 }
 

-const int communicator::send_count_before_flush = 4;
+int communicator::send_count_before_flush = 4;

 
 communicator::communicator()
     : host((hostdata* )MSG_host_get_data(MSG_host_self()))
 
 communicator::communicator()
     : host((hostdata* )MSG_host_get_data(MSG_host_self()))


@@ -52,10 +52,11 @@ communicator::~communicator()
     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, get_data_mbox());
 
     task = MSG_task_create("finalize", 0.0, 0, NULL);
     MSG_task_send(task, get_data_mbox());
 

-    DEBUG0("wait for receiver to terminate");

     xbt_mutex_acquire(mutex);
     xbt_mutex_acquire(mutex);

-    while (receiver_process)
+    while (receiver_process) {
+        DEBUG0("waiting for receiver to terminate");

         xbt_cond_wait(cond, mutex);
         xbt_cond_wait(cond, mutex);

+    }

     xbt_mutex_release(mutex);
 
     if (ctrl_comm)
     xbt_mutex_release(mutex);
 
     if (ctrl_comm)


@@ -92,10 +93,11 @@ void communicator::send(const char* dest, message* msg)
 bool communicator::recv(message*& msg, m_host_t& from, bool wait)
 {
     if (wait) {
 bool communicator::recv(message*& msg, m_host_t& from, bool wait)
 {
     if (wait) {

-        DEBUG0("suspend main process on recv");

         xbt_mutex_acquire(mutex);
         xbt_mutex_acquire(mutex);

-        while (received.empty())
+        while (received.empty()) {
+            DEBUG0("waiting for a message to come");

             xbt_cond_wait(cond, mutex);
             xbt_cond_wait(cond, mutex);

+        }

         xbt_mutex_release(mutex);
     }
 
         xbt_mutex_release(mutex);
     }