X-Git-Url: https://bilbo.iut-bm.univ-fcomte.fr/and/gitweb/loba.git/blobdiff_plain/6d4c5d60667c9b096a969e8a438c6fd4d8484cd1..022ced16770ece3702b75569cd8d6dd98d47690f:/messages.cpp?ds=sidebyside diff --git a/messages.cpp b/messages.cpp index 2d5de94..70e2236 100644 --- a/messages.cpp +++ b/messages.cpp @@ -51,7 +51,7 @@ std::string message::to_string() 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 @@ -61,38 +61,31 @@ 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 = nullptr; 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"); - 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 + 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(pop_was_successful); - } else { - mutex.release(); + xbt_assert(hit_timeout || pop_was_successful); } + 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);