#include "xbt/log.h"
#include "src/msg/msg_private.h"
-#include "src/msg/msg_mailbox.h"
-
-#include "simgrid/s4u/mailbox.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_network_private.h"
+#include "simgrid/s4u/Mailbox.hpp"
XBT_LOG_EXTERNAL_CATEGORY(s4u);
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
+namespace simgrid {
+namespace s4u {
-using namespace simgrid;
+const char *Mailbox::name() {
+ return pimpl_->name_;
+}
-boost::unordered_map <std::string, s4u::Mailbox *> *s4u::Mailbox::mailboxes = new boost::unordered_map<std::string, s4u::Mailbox*> ();
+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);
+ });
+ }
+ return MailboxPtr(&mbox->piface_, true);
+}
+MailboxPtr Mailbox::byName(std::string name)
+{
+ return byName(name.c_str());
+}
-s4u::Mailbox::Mailbox(const char*name, smx_rdv_t inferior) {
- inferior_ = inferior;
- name_ = name;
- mailboxes->insert({name, this});
+bool Mailbox::empty()
+{
+ return pimpl_->comm_queue.empty();
}
-const char *s4u::Mailbox::getName() {
- return name_.c_str();
+
+smx_activity_t Mailbox::front()
+{
+ return pimpl_->comm_queue.empty() ? nullptr : pimpl_->comm_queue.front();
+}
+
+void Mailbox::setReceiver(ActorPtr actor) {
+ simix::kernelImmediate([this, actor]() {
+ this->pimpl_->setReceiver(actor);
+ });
+}
+
+/** @brief get the receiver (process associated to the mailbox) */
+ActorPtr Mailbox::receiver() {
+ if (pimpl_->permanent_receiver == nullptr)
+ return ActorPtr();
+ return pimpl_->permanent_receiver->iface();
+}
+
}
-s4u::Mailbox *s4u::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 rdv.
- // 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_rdv_create(name));
- res = mailboxes->at(name); // Use the stored one, even if it's not the one I created myself.
- }
- return res;
}
