X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfaf71bdfb6cf3cb4d0908080b7fb67fa4d5051c..4b0fa756ae6e58a74c374a519389ecb9e8b6a4d9:/src/s4u/s4u_Mailbox.cpp diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp index abbf92e21a..01cb3eb499 100644 --- a/src/s4u/s4u_Mailbox.cpp +++ b/src/s4u/s4u_Mailbox.cpp @@ -34,17 +34,17 @@ Mailbox* Mailbox::by_name(const std::string& name) return &mbox->piface_; } -bool Mailbox::empty() +bool Mailbox::empty() const { 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()); } -aid_t Mailbox::listen_from() +aid_t Mailbox::listen_from() const { kernel::activity::CommImplPtr comm = front(); if (comm && comm->src_actor_) @@ -53,7 +53,7 @@ aid_t Mailbox::listen_from() return -1; } -bool Mailbox::ready() +bool Mailbox::ready() const { bool comm_ready = false; if (not pimpl_->comm_queue_.empty()) { @@ -65,7 +65,7 @@ bool Mailbox::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(); } @@ -76,7 +76,7 @@ void Mailbox::set_receiver(ActorPtr actor) } /** @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(); @@ -85,24 +85,26 @@ ActorPtr Mailbox::get_receiver() 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; } -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; } -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"); - s4u::CommPtr res = put_init(payload, simulated_size_in_bytes); + CommPtr res = put_init(payload, simulated_size_in_bytes); res->vetoable_start(); return res; } @@ -128,16 +130,17 @@ void Mailbox::put(void* payload, uint64_t simulated_size_in_bytes, double timeou 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; } -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;