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
added circle placement for ns3 wifi nodes
[simgrid.git]
/
src
/
s4u
/
s4u_Mailbox.cpp
diff --git
a/src/s4u/s4u_Mailbox.cpp
b/src/s4u/s4u_Mailbox.cpp
index e7fb05d6b7e74053a85a7db43a8e92f4bc9f0ff1..01cb3eb499a8a306bc3b912b7423f7de52b125bb 100644
(file)
--- a/
src/s4u/s4u_Mailbox.cpp
+++ b/
src/s4u/s4u_Mailbox.cpp
@@
-34,17
+34,26
@@
Mailbox* Mailbox::by_name(const std::string& name)
return &mbox->piface_;
}
return &mbox->piface_;
}
-bool Mailbox::empty()
+bool Mailbox::empty()
const
{
return pimpl_->comm_queue_.empty();
}
{
return pimpl_->comm_queue_.empty();
}
-bool Mailbox::listen()
+bool Mailbox::listen()
const
{
return not this->empty() || (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty());
}
{
return not this->empty() || (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty());
}
-bool Mailbox::ready()
+aid_t Mailbox::listen_from() const
+{
+ kernel::activity::CommImplPtr comm = front();
+ if (comm && comm->src_actor_)
+ return comm->src_actor_->get_pid();
+ else
+ return -1;
+}
+
+bool Mailbox::ready() const
{
bool comm_ready = false;
if (not pimpl_->comm_queue_.empty()) {
{
bool comm_ready = false;
if (not pimpl_->comm_queue_.empty()) {
@@
-56,7
+65,7
@@
bool Mailbox::ready()
return comm_ready;
}
return comm_ready;
}
-kernel::activity::CommImplPtr Mailbox::front()
+kernel::activity::CommImplPtr Mailbox::front()
const
{
return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front();
}
{
return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front();
}
@@
-67,7
+76,7
@@
void Mailbox::set_receiver(ActorPtr actor)
}
/** @brief get the receiver (process associated to the mailbox) */
}
/** @brief get the receiver (process associated to the mailbox) */
-ActorPtr Mailbox::get_receiver()
+ActorPtr Mailbox::get_receiver()
const
{
if (pimpl_->permanent_receiver_ == nullptr)
return ActorPtr();
{
if (pimpl_->permanent_receiver_ == nullptr)
return ActorPtr();
@@
-76,24
+85,26
@@
ActorPtr Mailbox::get_receiver()
CommPtr Mailbox::put_init()
{
CommPtr Mailbox::put_init()
{
- CommPtr res
= CommPtr(new s4u::
Comm());
+ CommPtr res
(new
Comm());
res->sender_ = kernel::actor::ActorImpl::self();
res->mailbox_ = this;
return res;
}
res->sender_ = kernel::actor::ActorImpl::self();
res->mailbox_ = this;
return res;
}
-s4u::CommPtr Mailbox::put_init(void* data, uint64_t simulated_size_in_bytes)
+
+CommPtr Mailbox::put_init(void* data, uint64_t simulated_size_in_bytes)
{
{
-
s4u::
CommPtr res = put_init();
+ CommPtr res = put_init();
res->set_remaining(simulated_size_in_bytes);
res->src_buff_ = data;
res->src_buff_size_ = sizeof(void*);
return res;
}
res->set_remaining(simulated_size_in_bytes);
res->src_buff_ = data;
res->src_buff_size_ = sizeof(void*);
return res;
}
-s4u::CommPtr Mailbox::put_async(void* payload, uint64_t simulated_size_in_bytes)
+
+CommPtr Mailbox::put_async(void* payload, uint64_t simulated_size_in_bytes)
{
xbt_assert(payload != nullptr, "You cannot send nullptr");
{
xbt_assert(payload != nullptr, "You cannot send nullptr");
-
s4u::
CommPtr res = put_init(payload, simulated_size_in_bytes);
+ CommPtr res = put_init(payload, simulated_size_in_bytes);
res->vetoable_start();
return res;
}
res->vetoable_start();
return res;
}
@@
-119,16
+130,17
@@
void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou
c->wait_for(timeout);
}
c->wait_for(timeout);
}
-
s4u::
CommPtr Mailbox::get_init()
+CommPtr Mailbox::get_init()
{
{
- CommPtr res
= CommPtr(new s4u::
Comm());
+ CommPtr res
(new
Comm());
res->receiver_ = kernel::actor::ActorImpl::self();
res->mailbox_ = this;
return res;
}
res->receiver_ = kernel::actor::ActorImpl::self();
res->mailbox_ = this;
return res;
}
-s4u::CommPtr Mailbox::get_async(void** data)
+
+CommPtr Mailbox::get_async(void** data)
{
{
-
s4u::
CommPtr res = get_init();
+ CommPtr res = get_init();
res->set_dst_data(data, sizeof(*data));
res->vetoable_start();
return res;
res->set_dst_data(data, sizeof(*data));
res->vetoable_start();
return res;
@@
-167,7
+179,7
@@
sg_mailbox_t sg_mailbox_by_name(const char* alias)
return simgrid::s4u::Mailbox::by_name(alias);
}
return simgrid::s4u::Mailbox::by_name(alias);
}
-const char* sg_mailbox_get_name(sg_mailbox_t mailbox)
+const char* sg_mailbox_get_name(
const_
sg_mailbox_t mailbox)
{
return mailbox->get_cname();
}
{
return mailbox->get_cname();
}
@@
-201,9
+213,16
@@
void* sg_mailbox_get(sg_mailbox_t mailbox)
return mailbox->get();
}
return mailbox->get();
}
+sg_comm_t sg_mailbox_get_async(sg_mailbox_t mailbox, void** data)
+{
+ auto comm = mailbox->get_async(data);
+ comm->add_ref();
+ return comm.get();
+}
+
void sg_mailbox_put(sg_mailbox_t mailbox, void* payload, long simulated_size_in_bytes)
{
void sg_mailbox_put(sg_mailbox_t mailbox, void* payload, long simulated_size_in_bytes)
{
-
return
mailbox->put(payload, simulated_size_in_bytes);
+ mailbox->put(payload, simulated_size_in_bytes);
}
sg_comm_t sg_mailbox_put_async(sg_mailbox_t mailbox, void* payload, long simulated_size_in_bytes)
}
sg_comm_t sg_mailbox_put_async(sg_mailbox_t mailbox, void* payload, long simulated_size_in_bytes)
@@
-212,3
+231,10
@@
sg_comm_t sg_mailbox_put_async(sg_mailbox_t mailbox, void* payload, long simulat
comm->add_ref();
return comm.get();
}
comm->add_ref();
return comm.get();
}
+
+sg_comm_t sg_mailbox_put_init(sg_mailbox_t mailbox, void* payload, long simulated_size_in_bytes)
+{
+ auto comm = mailbox->put_init(payload, simulated_size_in_bytes);
+ comm->add_ref();
+ return comm.get();
+}