-boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = new boost::unordered_map<std::string, s4u::Mailbox*> ();
-
-Mailbox::Mailbox(const char*name, smx_mailbox_t inferior) {
- pimpl_ = inferior;
- name_ = name;
- mailboxes->insert({name, this});
-}
-const char *Mailbox::getName() {
- return name_.c_str();
-}
-Mailbox *Mailbox::byName(const char*name) {
- s4u::Mailbox *res;
- try {
- res = mailboxes->at(name);
- } catch (std::out_of_range& e) {
- // FIXME: there is a potential race condition here where two actors run Mailbox::byName on a non-existent mailbox
- // during the same scheduling round. Both will be interrupted in the simcall creating the underlying simix mbox.
- // Only one simix object will be created, but two S4U objects will be created.
- // Only one S4U object will be stored in the hashmap and used, and the other one will be leaked.
- new Mailbox(name,simcall_mbox_create(name));
- res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
+const simgrid::xbt::string& Mailbox::get_name() const
+{
+ return pimpl_->get_name();
+}
+
+const char* Mailbox::get_cname() const
+{
+ return pimpl_->get_cname();
+}
+
+MailboxPtr Mailbox::byName(const char*name)
+{
+ kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::byNameOrNull(name);
+ if (mbox == nullptr) {
+ mbox = simix::kernelImmediate([name] {
+ return kernel::activity::MailboxImpl::byNameOrCreate(name);
+ });