#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Mailbox.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.hpp"
#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_network_private.h"
+#include "src/simix/smx_network_private.hpp"
#include "xbt/log.h"
XBT_LOG_EXTERNAL_CATEGORY(s4u);
namespace simgrid {
namespace s4u {
-const char *Mailbox::name() {
- return pimpl_->name_;
+const simgrid::xbt::string& Mailbox::getName() const
+{
+ return pimpl_->getName();
+}
+
+const char* Mailbox::getCname() const
+{
+ return pimpl_->getCname();
}
MailboxPtr Mailbox::byName(const char*name)
}
void Mailbox::setReceiver(ActorPtr actor) {
- simix::kernelImmediate([this, actor]() {
- this->pimpl_->setReceiver(actor);
- });
+ simix::kernelImmediate([this, actor]() { this->pimpl_->setReceiver(actor); });
}
/** @brief get the receiver (process associated to the mailbox) */
-ActorPtr Mailbox::receiver() {
+ActorPtr Mailbox::getReceiver()
+{
if (pimpl_->permanent_receiver == nullptr)
return ActorPtr();
return pimpl_->permanent_receiver->iface();
res->mailbox_ = this;
return res;
}
-s4u::CommPtr Mailbox::put_init(void* data, int simulatedSize)
+s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulatedSize)
{
s4u::CommPtr res = put_init();
res->setRemains(simulatedSize);
res->srcBuffSize_ = sizeof(void*);
return res;
}
-s4u::CommPtr Mailbox::put_async(void* data, int simulatedSize)
+s4u::CommPtr Mailbox::put_async(void* payload, uint64_t simulatedSize)
{
- s4u::CommPtr res = put_init(data, 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, double simulatedSize)
+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, double simulatedSize, double 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);