X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccc3b6ac54d65bf59be965f90ea657deea9bafa8..c139b4e36702f58bd8a75e87cf537959da82dbc9:/src/s4u/s4u_mailbox.cpp

diff --git a/src/s4u/s4u_mailbox.cpp b/src/s4u/s4u_mailbox.cpp
index 57d94c7105..92a03fcb65 100644
--- a/src/s4u/s4u_mailbox.cpp
+++ b/src/s4u/s4u_mailbox.cpp
@@ -1,14 +1,14 @@
-/* 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 "src/msg/msg_private.h"
+#include "simgrid/s4u/Comm.hpp"
+#include "simgrid/s4u/Mailbox.hpp"
+#include "src/msg/msg_private.hpp"
 #include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_network_private.h"
-#include "simgrid/s4u/mailbox.hpp"
+#include "src/simix/smx_network_private.hpp"
+#include "xbt/log.h"
 
 XBT_LOG_EXTERNAL_CATEGORY(s4u);
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
@@ -16,21 +16,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
 namespace simgrid {
 namespace s4u {
 
-const char *Mailbox::getName() {
-  return pimpl_->name;
+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)
 {
-  // FIXME: there is a 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.
-  smx_mailbox_t mbox = SIMIX_mbox_get_by_name(name);
-  if (mbox == nullptr)
-    mbox = simcall_mbox_create(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);
 }
 
@@ -44,21 +47,102 @@ bool Mailbox::empty()
   return pimpl_->comm_queue.empty();
 }
 
+bool Mailbox::listen()
+{
+  return not this->empty() || (pimpl_->permanent_receiver && not pimpl_->done_comm_queue.empty());
+}
+
 smx_activity_t Mailbox::front()
 {
   return pimpl_->comm_queue.empty() ? nullptr : pimpl_->comm_queue.front();
 }
 
 void Mailbox::setReceiver(ActorPtr actor) {
-  simcall_mbox_set_receiver(pimpl_, actor == nullptr ? nullptr : actor->pimpl_);
+  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)
+ActorPtr Mailbox::getReceiver()
+{
+  if (pimpl_->permanent_receiver == nullptr)
     return ActorPtr();
-  return ActorPtr(&pimpl_->permanent_receiver->getIface());
+  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");
 
+  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");
+
+  CommPtr c = put_init();
+  c->setRemains(simulatedSize);
+  c->setSrcData(payload);
+  c->wait();
+}
+/** 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);
+}
+
+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;
+}
+
+void* Mailbox::get()
+{
+  void* res = nullptr;
+  CommPtr c = get_init();
+  c->setDstData(&res, sizeof(res));
+  c->wait();
+  return res;
+}
+void* Mailbox::get(double timeout)
+{
+  void* res = nullptr;
+  CommPtr c = get_init();
+  c->setDstData(&res, sizeof(res));
+  c->wait(timeout);
+  return res;
+}
 }
 }