X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2455643f96166346bf10d16ddc289cc44f1fe78a..07b09b9e970194b4e6f478ddebe6a59bc6fdbeb0:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index ace9d8cf2c..b53d652f30 100644
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -1,68 +1,145 @@
-/* Copyright (c) 2006-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2006-2017. 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 "xbt/log.h"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
 #include "src/msg/msg_private.h"
-
-#include "simgrid/s4u/mailbox.hpp"
+#include "src/simix/ActorImpl.hpp"
+#include "src/simix/smx_network_private.h"
+#include "xbt/log.h"
 
 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::getName()
+{
+  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_mailbox_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();
+
+bool Mailbox::listen()
+{
+  return not this->empty() || (pimpl_->permanent_receiver && not pimpl_->done_comm_queue.empty());
 }
-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 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.
-  }
+
+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::getReceiver()
+{
+  if (pimpl_->permanent_receiver == nullptr)
+    return ActorPtr();
+  return pimpl_->permanent_receiver->iface();
+}
+
+CommPtr Mailbox::put_init()
+{
+  CommPtr res   = CommPtr(new s4u::Comm());
+  res->sender_  = SIMIX_process_self();
+  res->mailbox_ = this;
   return res;
 }
+s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulatedSize)
+{
+  s4u::CommPtr res = put_init();
+  res->setRemains(simulatedSize);
+  res->srcBuff_     = data;
+  res->srcBuffSize_ = sizeof(void*);
+  return res;
+}
+s4u::CommPtr Mailbox::put_async(void* payload, uint64_t simulatedSize)
+{
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
 
-bool s4u::Mailbox::empty() {
-  return nullptr == simcall_mbox_get_head(inferior_);
+  s4u::CommPtr res = put_init(payload, simulatedSize);
+  res->start();
+  return res;
 }
+void Mailbox::put(void* payload, uint64_t simulatedSize)
+{
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
 
-void s4u::Mailbox::setReceiver(smx_process_t process) {
-  simcall_mbox_set_receiver(inferior_, process);
+  CommPtr c = put_init();
+  c->setRemains(simulatedSize);
+  c->setSrcData(payload);
+  c->wait();
 }
-smx_process_t s4u::Mailbox::receiver() {
-  return simcall_mbox_get_receiver(inferior_);
+/** Blocking send with timeout */
+void Mailbox::put(void* payload, uint64_t simulatedSize, double timeout)
+{
+  xbt_assert(payload != nullptr, "You cannot send nullptr");
+
+  CommPtr c = put_init();
+  c->setRemains(simulatedSize);
+  c->setSrcData(payload);
+  // c->start() is optional.
+  c->wait(timeout);
 }
 
-/*------- C functions -------*/
+s4u::CommPtr Mailbox::get_init()
+{
+  CommPtr res    = CommPtr(new s4u::Comm());
+  res->receiver_ = SIMIX_process_self();
+  res->mailbox_  = this;
+  return res;
+}
+s4u::CommPtr Mailbox::get_async(void** data)
+{
+  s4u::CommPtr res = get_init();
+  res->setDstData(data, sizeof(*data));
+  res->start();
+  return res;
+}
 
-sg_mbox_t sg_mbox_by_name(const char*name){
-  return s4u::Mailbox::byName(name);
+void* Mailbox::get()
+{
+  void* res = nullptr;
+  CommPtr c = get_init();
+  c->setDstData(&res, sizeof(res));
+  c->wait();
+  return res;
 }
-int sg_mbox_is_empty(sg_mbox_t mbox) {
-  return mbox->empty();
+void* Mailbox::get(double timeout)
+{
+  void* res = nullptr;
+  CommPtr c = get_init();
+  c->setDstData(&res, sizeof(res));
+  c->wait(timeout);
+  return res;
 }
-void sg_mbox_setReceiver(sg_mbox_t mbox, smx_process_t process) {
-  mbox->setReceiver(process);
 }
-smx_process_t sg_mbox_receiver(sg_mbox_t mbox) {
-  return mbox->receiver();
 }