#include "src/kernel/activity/MailboxImpl.hpp"
#include "src/kernel/activity/CommImpl.hpp"
+#include <unordered_map>
+
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_mailbox, simix, "Mailbox implementation");
-static std::map<std::string, smx_mailbox_t>* mailboxes = new std::map<std::string, smx_mailbox_t>;
+static std::unordered_map<std::string, smx_mailbox_t> mailboxes;
void SIMIX_mailbox_exit()
{
- for (auto const& elm : *mailboxes)
+ for (auto const& elm : mailboxes)
delete elm.second;
- delete mailboxes;
+ mailboxes.clear();
}
/******************************************************************************/
/** @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())
+ auto mbox = mailboxes.find(name);
+ if (mbox != mailboxes.end())
return mbox->second;
else
return nullptr;
MailboxImpl* MailboxImpl::by_name_or_create(const std::string& name)
{
/* two processes may have pushed the same mbox_create simcall at the same time */
- auto m = mailboxes->find(name);
- if (m == mailboxes->end()) {
- smx_mailbox_t mbox = new MailboxImpl(name);
+ 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)[mbox->name_] = mbox;
+ mailboxes[name] = mbox;
return mbox;
} else
return m->second;
/** @brief Pushes a communication activity into a mailbox
* @param comm What to add
*/
-void MailboxImpl::push(activity::CommImplPtr comm)
+void MailboxImpl::push(CommImplPtr comm)
{
comm->mbox = this;
this->comm_queue_.push_back(std::move(comm));
}
/** @brief Removes a communication activity from a mailbox
- * @param activity What to remove
+ * @param comm What to remove
*/
-void MailboxImpl::remove(smx_activity_t activity)
+void MailboxImpl::remove(const CommImplPtr& comm)
{
- simgrid::kernel::activity::CommImplPtr comm =
- boost::static_pointer_cast<simgrid::kernel::activity::CommImpl>(activity);
-
xbt_assert(comm->mbox == this, "Comm %p is in mailbox %s, not mailbox %s", comm.get(),
(comm->mbox ? comm->mbox->get_cname() : "(null)"), this->get_cname());
comm->mbox = nullptr;
xbt_die("Comm %p not found in mailbox %s", comm.get(), this->get_cname());
}
-smx_activity_t MailboxImpl::iprobe(int type, int (*match_fun)(void*, void*, CommImpl*), void* data)
+CommImplPtr MailboxImpl::iprobe(int type, int (*match_fun)(void*, void*, CommImpl*), void* data)
{
XBT_DEBUG("iprobe from %p %p", this, &comm_queue_);
CommImplPtr this_comm;
CommImpl::Type smx_type;
if (type == 1) {
- this_comm = CommImplPtr(new CommImpl(CommImpl::Type::SEND));
- smx_type = CommImpl::Type::SEND;
- } else {
- this_comm = CommImplPtr(new CommImpl(CommImpl::Type::RECEIVE));
+ this_comm = CommImplPtr(new CommImpl());
+ this_comm->set_type(CommImpl::Type::SEND);
smx_type = CommImpl::Type::RECEIVE;
+ } else {
+ this_comm = CommImplPtr(new CommImpl());
+ this_comm->set_type(CommImpl::Type::RECEIVE);
+ smx_type = CommImpl::Type::SEND;
}
- smx_activity_t other_synchro = nullptr;
+ 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_synchro = find_matching_comm(smx_type, match_fun, data, this_comm, /*done*/ true, /*remove_matching*/ false);
+ other_comm = find_matching_comm(smx_type, match_fun, data, this_comm, /*done*/ true, /*remove_matching*/ false);
}
- if (not other_synchro) {
+ if (not other_comm) {
XBT_DEBUG("check if we have more luck in the normal mailbox");
- other_synchro = find_matching_comm(smx_type, match_fun, data, this_comm, /*done*/ false, /*remove_matching*/ false);
+ other_comm = find_matching_comm(smx_type, match_fun, data, this_comm, /*done*/ false, /*remove_matching*/ false);
}
- return other_synchro;
+ return other_comm;
}
/**
* @return The communication activity if found, nullptr otherwise
*/
CommImplPtr MailboxImpl::find_matching_comm(CommImpl::Type type, int (*match_fun)(void*, void*, CommImpl*),
- void* this_user_data, CommImplPtr my_synchro, bool done,
+ void* this_user_data, const CommImplPtr& my_synchro, bool done,
bool remove_matching)
{
void* other_user_data = nullptr;
- boost::circular_buffer_space_optimized<smx_activity_t>* deque;
- if (done)
- deque = &done_comm_queue_;
- else
- deque = &comm_queue_;
+ auto& comm_queue = done ? done_comm_queue_ : comm_queue_;
- for (auto it = deque->begin(); it != deque->end(); it++) {
- CommImplPtr comm = boost::dynamic_pointer_cast<CommImpl>(std::move(*it));
+ for (auto it = comm_queue.begin(); it != comm_queue.end(); it++) {
+ CommImplPtr& comm = *it;
- if (comm->type == CommImpl::Type::SEND) {
+ if (comm->type_ == CommImpl::Type::SEND) {
other_user_data = comm->src_data_;
- } else if (comm->type == CommImpl::Type::RECEIVE) {
+ } 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())) &&
+ 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 (remove_matching)
- deque->erase(it);
#if SIMGRID_HAVE_MC
comm->mbox_cpy = comm->mbox;
#endif
comm->mbox = nullptr;
- return comm;
+ 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);
+ comm.get(), (int)comm->type_, (int)type);
}
XBT_DEBUG("No matching communication synchro found");
return nullptr;
}
-}
-}
-}
+} // namespace activity
+} // namespace kernel
+} // namespace simgrid
