void SIMIX_mailbox_exit()
{
- for (auto elm : *mailboxes)
+ for (auto const& elm : *mailboxes)
delete elm.second;
delete mailboxes;
}
*/
void MailboxImpl::setReceiver(s4u::ActorPtr actor)
{
- this->permanent_receiver = actor.get()->getImpl();
+ if (actor != nullptr)
+ this->permanent_receiver = actor.get()->getImpl();
+ else
+ this->permanent_receiver = nullptr;
}
/** @brief Pushes a communication activity into a mailbox
* @param comm What to add
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->name_ : "(null)"), this->name_);
+ (comm->mbox ? comm->mbox->getCname() : "(null)"), this->getCname());
comm->mbox = nullptr;
for (auto it = this->comm_queue.begin(); it != this->comm_queue.end(); it++)
if (*it == comm) {
this->comm_queue.erase(it);
return;
}
- xbt_die("Comm %p not found in mailbox %s", comm.get(), this->name_);
+ xbt_die("Comm %p not found in mailbox %s", comm.get(), this->getCname());
}
}
}