* under the terms of the license (GNU LGPL) which comes with this package. */
#include "src/kernel/activity/MailboxImpl.hpp"
+#include "simgrid/msg.h"
#include "src/kernel/activity/CommImpl.hpp"
#include <unordered_map>
/* Rendez-Vous Points */
/******************************************************************************/
-namespace simgrid {
-namespace kernel {
-namespace activity {
+namespace simgrid::kernel::activity {
unsigned MailboxImpl::next_id_ = 0;
void MailboxImpl::set_receiver(s4u::ActorPtr actor)
{
if (this->permanent_receiver_) {
- std::vector<MailboxImpl*>& mboxes = this->permanent_receiver_->mailboxes;
+ std::vector<MailboxImpl*>& mboxes = this->permanent_receiver_->mailboxes_;
mboxes.erase(std::remove(mboxes.begin(), mboxes.end(), this), mboxes.end());
}
*/
void MailboxImpl::clear()
{
+ // CommImpl::cancel() will remove the comm from the mailbox..
for (auto comm : done_comm_queue_) {
comm->cancel();
- comm->set_state(State::DST_HOST_FAILURE);
+ comm->set_state(State::FAILED);
+ comm->post();
}
done_comm_queue_.clear();
- // CommImpl::cancel() will remove the comm from the mailbox..
while (not comm_queue_.empty()) {
auto comm = comm_queue_.back();
- if (comm->get_state() == State::WAITING && not comm->detached()) {
+ if (comm->get_state() == State::WAITING && not comm->is_detached()) {
comm->cancel();
- comm->set_state(State::DST_HOST_FAILURE);
+ comm->set_state(State::FAILED);
+ comm->post();
} else
comm_queue_.pop_back();
}
+ xbt_assert(comm_queue_.empty() && done_comm_queue_.empty());
}
-CommImplPtr MailboxImpl::iprobe(int type, bool (*match_fun)(void*, void*, CommImpl*), void* data)
+CommImplPtr MailboxImpl::iprobe(int type, const std::function<bool(void*, void*, CommImpl*)>& match_fun, void* data)
{
XBT_DEBUG("iprobe from %p %p", this, &comm_queue_);
* @param remove_matching whether or not to clean the found object from the queue
* @return The communication activity if found, nullptr otherwise
*/
-CommImplPtr MailboxImpl::find_matching_comm(CommImplType type, bool (*match_fun)(void*, void*, CommImpl*),
+CommImplPtr MailboxImpl::find_matching_comm(CommImplType type,
+ const std::function<bool(void*, void*, CommImpl*)>& match_fun,
void* this_user_data, const CommImplPtr& my_synchro, bool done,
bool remove_matching)
{
const CommImplPtr& comm = *iter;
XBT_DEBUG("Found a matching communication synchro %p", comm.get());
-#if SIMGRID_HAVE_MC
- comm->mbox_cpy = comm->get_mailbox();
-#endif
comm->set_mailbox(nullptr);
CommImplPtr comm_cpy = comm;
if (remove_matching)
comm_queue.erase(iter);
return comm_cpy;
}
-} // namespace activity
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::activity