namespace simgrid {
namespace s4u {
-const simgrid::xbt::string& Mailbox::get_name() const
+const xbt::string& Mailbox::get_name() const
{
return pimpl_->get_name();
}
return pimpl_->get_cname();
}
-MailboxPtr Mailbox::by_name(const std::string& name)
+Mailbox* Mailbox::by_name(const std::string& name)
{
kernel::activity::MailboxImpl* mbox = kernel::activity::MailboxImpl::by_name_or_null(name);
if (mbox == nullptr) {
- mbox = simix::simcall([name] { return kernel::activity::MailboxImpl::by_name_or_create(name); });
+ mbox = kernel::actor::simcall([&name] { return kernel::activity::MailboxImpl::by_name_or_create(name); });
}
- return MailboxPtr(&mbox->piface_, true);
+ return &mbox->piface_;
}
bool Mailbox::empty()
{
bool comm_ready = false;
if (not pimpl_->comm_queue_.empty()) {
- comm_ready = pimpl_->comm_queue_.front()->state_ == SIMIX_DONE;
-
+ comm_ready = pimpl_->comm_queue_.front()->state_ == kernel::activity::State::DONE;
+
} else if (pimpl_->permanent_receiver_ && not pimpl_->done_comm_queue_.empty()) {
- comm_ready = pimpl_->done_comm_queue_.front()->state_ == SIMIX_DONE;
+ comm_ready = pimpl_->done_comm_queue_.front()->state_ == kernel::activity::State::DONE;
}
return comm_ready;
}
-smx_activity_t Mailbox::front()
+kernel::activity::CommImplPtr Mailbox::front()
{
return pimpl_->comm_queue_.empty() ? nullptr : pimpl_->comm_queue_.front();
}
void Mailbox::set_receiver(ActorPtr actor)
{
- simix::simcall([this, actor]() { this->pimpl_->set_receiver(actor); });
+ kernel::actor::simcall([this, actor]() { this->pimpl_->set_receiver(actor); });
}
/** @brief get the receiver (process associated to the mailbox) */
CommPtr Mailbox::put_init()
{
CommPtr res = CommPtr(new s4u::Comm());
- res->sender_ = SIMIX_process_self();
+ res->sender_ = kernel::actor::ActorImpl::self();
res->mailbox_ = this;
return res;
}
s4u::CommPtr Mailbox::get_init()
{
CommPtr res = CommPtr(new s4u::Comm());
- res->receiver_ = SIMIX_process_self();
+ res->receiver_ = kernel::actor::ActorImpl::self();
res->mailbox_ = this;
return res;
}
return res;
}
-smx_activity_t Mailbox::iprobe(int type, int (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
+smx_activity_t Mailbox::iprobe(int type, bool (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data)
{
- return simix::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
+ return kernel::actor::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); });
}
} // namespace s4u
} // namespace simgrid