X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3e1507aae0c6ef620ee4aa68c4f6d32795fc2ea1..20ec61117d07aac36be57b81054710603f2656ce:/src/kernel/activity/MailboxImpl.cpp diff --git a/src/kernel/activity/MailboxImpl.cpp b/src/kernel/activity/MailboxImpl.cpp index 3137c62f3e..88b2a08a13 100644 --- a/src/kernel/activity/MailboxImpl.cpp +++ b/src/kernel/activity/MailboxImpl.cpp @@ -1,59 +1,40 @@ -/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * 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 -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mailbox, simix, "Mailbox implementation"); - -static std::unordered_map mailboxes; - -void SIMIX_mailbox_exit() -{ - for (auto const& elm : mailboxes) - delete elm.second; - mailboxes.clear(); -} +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(ker_mailbox, kernel, "Mailbox implementation"); /******************************************************************************/ /* Rendez-Vous Points */ /******************************************************************************/ -namespace simgrid { -namespace kernel { -namespace activity { -/** @brief Returns the mailbox of that name, or nullptr */ -MailboxImpl* MailboxImpl::by_name_or_null(const std::string& name) -{ - auto mbox = mailboxes.find(name); - if (mbox != mailboxes.end()) - return mbox->second; - else - return nullptr; -} +namespace simgrid::kernel::activity { + +unsigned MailboxImpl::next_id_ = 0; -/** @brief Returns the mailbox of that name, newly created on need */ -MailboxImpl* MailboxImpl::by_name_or_create(const std::string& name) +MailboxImpl::~MailboxImpl() { - /* two processes may have pushed the same mbox_create simcall at the same time */ - auto m = mailboxes.find(name); - if (m == mailboxes.end()) { - MailboxImpl* mbox = new MailboxImpl(name); - XBT_DEBUG("Creating a mailbox at %p with name %s", mbox, name.c_str()); - mailboxes[name] = mbox; - return mbox; - } else - return m->second; + clear(); + set_receiver(nullptr); } + /** @brief set the receiver of the mailbox to allow eager sends * @param actor The receiving dude */ void MailboxImpl::set_receiver(s4u::ActorPtr actor) { + if (this->permanent_receiver_) { + std::vector& mboxes = this->permanent_receiver_->mailboxes_; + mboxes.erase(std::remove(mboxes.begin(), mboxes.end(), this), mboxes.end()); + } + if (actor != nullptr) this->permanent_receiver_ = actor->get_impl(); else @@ -85,29 +66,51 @@ void MailboxImpl::remove(const CommImplPtr& comm) xbt_die("Comm %p not found in mailbox %s", comm.get(), this->get_cname()); } -CommImplPtr MailboxImpl::iprobe(int type, int (*match_fun)(void*, void*, CommImpl*), void* data) +/** @brief Removes all communication activities from a mailbox + */ +void MailboxImpl::clear() +{ + // CommImpl::cancel() will remove the comm from the mailbox.. + for (auto comm : done_comm_queue_) { + comm->cancel(); + comm->set_state(State::FAILED); + comm->post(); + } + done_comm_queue_.clear(); + + while (not comm_queue_.empty()) { + auto comm = comm_queue_.back(); + if (comm->get_state() == State::WAITING && not comm->is_detached()) { + comm->cancel(); + 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, const std::function& match_fun, void* data) { XBT_DEBUG("iprobe from %p %p", this, &comm_queue_); - CommImplPtr this_comm; - CommImpl::Type smx_type; + CommImplPtr this_comm(new CommImpl); + CommImplType other_type; if (type == 1) { - this_comm = CommImplPtr(new CommImpl()); - this_comm->set_type(CommImpl::Type::SEND); - smx_type = CommImpl::Type::RECEIVE; + this_comm->set_type(CommImplType::SEND); + other_type = CommImplType::RECEIVE; } else { - this_comm = CommImplPtr(new CommImpl()); - this_comm->set_type(CommImpl::Type::RECEIVE); - smx_type = CommImpl::Type::SEND; + this_comm->set_type(CommImplType::RECEIVE); + other_type = CommImplType::SEND; } CommImplPtr other_comm = nullptr; if (permanent_receiver_ != nullptr && not done_comm_queue_.empty()) { XBT_DEBUG("first check in the permanent recv mailbox, to see if we already got something"); - other_comm = find_matching_comm(smx_type, match_fun, data, this_comm, /*done*/ true, /*remove_matching*/ false); + other_comm = find_matching_comm(other_type, match_fun, data, this_comm, /*done*/ true, /*remove_matching*/ false); } if (not other_comm) { XBT_DEBUG("check if we have more luck in the normal mailbox"); - other_comm = find_matching_comm(smx_type, match_fun, data, this_comm, /*done*/ false, /*remove_matching*/ false); + other_comm = find_matching_comm(other_type, match_fun, data, this_comm, /*done*/ false, /*remove_matching*/ false); } return other_comm; @@ -122,40 +125,30 @@ CommImplPtr MailboxImpl::iprobe(int type, int (*match_fun)(void*, void*, CommImp * @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(CommImpl::Type type, int (*match_fun)(void*, void*, CommImpl*), +CommImplPtr MailboxImpl::find_matching_comm(CommImplType type, + const std::function& match_fun, void* this_user_data, const CommImplPtr& my_synchro, bool done, bool remove_matching) { - void* other_user_data = nullptr; auto& comm_queue = done ? done_comm_queue_ : comm_queue_; - for (auto it = comm_queue.begin(); it != comm_queue.end(); it++) { - CommImplPtr& comm = *it; - - if (comm->type_ == CommImpl::Type::SEND) { - other_user_data = comm->src_data_; - } else if (comm->type_ == CommImpl::Type::RECEIVE) { - other_user_data = comm->dst_data_; - } - if (comm->type_ == type && (match_fun == nullptr || match_fun(this_user_data, other_user_data, comm.get())) && - (not comm->match_fun || comm->match_fun(other_user_data, this_user_data, my_synchro.get()))) { - 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(it); - return comm_cpy; - } - XBT_DEBUG("Sorry, communication synchro %p does not match our needs:" - " its type is %d but we are looking for a comm of type %d (or maybe the filtering didn't match)", - comm.get(), (int)comm->type_, (int)type); + auto iter = std::find_if( + comm_queue.begin(), comm_queue.end(), [&type, &match_fun, &this_user_data, &my_synchro](const CommImplPtr& comm) { + void* other_user_data = (comm->get_type() == CommImplType::SEND ? comm->src_data_ : comm->dst_data_); + return (comm->get_type() == type && (not match_fun || match_fun(this_user_data, other_user_data, comm.get())) && + (not comm->match_fun || comm->match_fun(other_user_data, this_user_data, my_synchro.get()))); + }); + if (iter == comm_queue.end()) { + XBT_DEBUG("No matching communication synchro found"); + return nullptr; } - XBT_DEBUG("No matching communication synchro found"); - return nullptr; + + const CommImplPtr& comm = *iter; + XBT_DEBUG("Found a matching communication synchro %p", comm.get()); + 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