A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[SMPI] Win::~Win(): Use class member rank_ instead of a local var
[simgrid.git]
/
src
/
s4u
/
s4u_mailbox.cpp
diff --git
a/src/s4u/s4u_mailbox.cpp
b/src/s4u/s4u_mailbox.cpp
index
b37d9ff
..
32ab0bb
100644
(file)
--- a/
src/s4u/s4u_mailbox.cpp
+++ b/
src/s4u/s4u_mailbox.cpp
@@
-5,9
+5,9
@@
#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Mailbox.hpp"
#include "simgrid/s4u/Comm.hpp"
#include "simgrid/s4u/Mailbox.hpp"
-#include "src/msg/msg_private.h"
+#include "src/msg/msg_private.h
pp
"
#include "src/simix/ActorImpl.hpp"
#include "src/simix/ActorImpl.hpp"
-#include "src/simix/smx_network_private.h"
+#include "src/simix/smx_network_private.h
pp
"
#include "xbt/log.h"
XBT_LOG_EXTERNAL_CATEGORY(s4u);
#include "xbt/log.h"
XBT_LOG_EXTERNAL_CATEGORY(s4u);
@@
-16,9
+16,14
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_channel,s4u,"S4U Communication Mailboxes");
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-const
char* Mailbox::getName()
+const
simgrid::xbt::string& Mailbox::getName() const
{
{
- return pimpl_->name_;
+ return pimpl_->getName();
+}
+
+const char* Mailbox::getCname() const
+{
+ return pimpl_->getCname();
}
MailboxPtr Mailbox::byName(const char*name)
}
MailboxPtr Mailbox::byName(const char*name)
@@
-53,9
+58,7
@@
smx_activity_t Mailbox::front()
}
void Mailbox::setReceiver(ActorPtr actor) {
}
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) */
}
/** @brief get the receiver (process associated to the mailbox) */
@@
-81,14
+84,18
@@
s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulatedSize)
res->srcBuffSize_ = sizeof(void*);
return res;
}
res->srcBuffSize_ = sizeof(void*);
return res;
}
-s4u::CommPtr Mailbox::put_async(void*
data
, uint64_t 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, uint64_t 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);
CommPtr c = put_init();
c->setRemains(simulatedSize);
c->setSrcData(payload);
@@
-97,6
+104,8
@@
void Mailbox::put(void* payload, uint64_t simulatedSize)
/** Blocking send with timeout */
void Mailbox::put(void* payload, uint64_t simulatedSize, double timeout)
{
/** 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);
CommPtr c = put_init();
c->setRemains(simulatedSize);
c->setSrcData(payload);