X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3ddc9f44269afaccfe0eb656b06bbd3ea591daf7..9caefc9fd82f338d9f8b9eede38a171aaff5f4bc:/src/s4u/s4u_Mailbox.cpp diff --git a/src/s4u/s4u_Mailbox.cpp b/src/s4u/s4u_Mailbox.cpp index 395ae73c1e..ffbfb69ebc 100644 --- a/src/s4u/s4u_Mailbox.cpp +++ b/src/s4u/s4u_Mailbox.cpp @@ -153,7 +153,8 @@ void* Mailbox::get(double timeout) return res; } -smx_activity_t Mailbox::iprobe(int type, bool (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data) +kernel::activity::ActivityImplPtr +Mailbox::iprobe(int type, bool (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data) { return kernel::actor::simcall([this, type, match_fun, data] { return pimpl_->iprobe(type, match_fun, data); }); } @@ -166,16 +167,11 @@ sg_mailbox_t sg_mailbox_by_name(const char* 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(); } -sg_comm_t sg_mailbox_put_async(sg_mailbox_t mailbox, void* payload, long simulated_size_in_bytes) -{ - return mailbox->put_async(payload, simulated_size_in_bytes); -} - /** @brief Set the mailbox to receive in asynchronous mode * * All messages sent to this mailbox will be transferred to the receiver without waiting for the receive call. @@ -204,3 +200,22 @@ void* sg_mailbox_get(sg_mailbox_t mailbox) { 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) +{ + return 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) +{ + auto comm = mailbox->put_async(payload, simulated_size_in_bytes); + comm->add_ref(); + return comm.get(); +}