X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4b04faa98dd6b4d52c3383a177e810f8e450fd48..fff9fbf510e8ac37ddb3bb622453d8b598806adf:/include/simgrid/s4u/Mailbox.hpp diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp index c009267909..d48166dfe3 100644 --- a/include/simgrid/s4u/Mailbox.hpp +++ b/include/simgrid/s4u/Mailbox.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -6,9 +6,13 @@ #ifndef SIMGRID_S4U_MAILBOX_HPP #define SIMGRID_S4U_MAILBOX_HPP -#include +#include #include +#include +#include +#include +#include #include namespace simgrid { @@ -16,41 +20,46 @@ namespace s4u { /** @brief Mailboxes: Network rendez-vous points. */ class XBT_PUBLIC Mailbox { - friend simgrid::s4u::Comm; - friend simgrid::kernel::activity::MailboxImpl; +#ifndef DOXYGEN + friend Comm; + friend smpi::Request; + friend kernel::activity::MailboxImpl; +#endif - simgrid::kernel::activity::MailboxImpl* const pimpl_; + kernel::activity::MailboxImpl* const pimpl_; explicit Mailbox(kernel::activity::MailboxImpl * mbox) : pimpl_(mbox) {} + ~Mailbox() = default; - /** private function to manage the mailboxes' lifetime (see @ref s4u_raii) */ - friend void intrusive_ptr_add_ref(Mailbox*) {} - /** private function to manage the mailboxes' lifetime (see @ref s4u_raii) */ - friend void intrusive_ptr_release(Mailbox*) {} +protected: + kernel::activity::MailboxImpl* get_impl() const { return pimpl_; } public: - /** private function, do not use. FIXME: make me protected */ - kernel::activity::MailboxImpl* get_impl() { return pimpl_; } - /** @brief Retrieves the name of that mailbox as a C++ string */ - const simgrid::xbt::string& get_name() const; + const xbt::string& get_name() const; /** @brief Retrieves the name of that mailbox as a C string */ const char* get_cname() const; - /** Retrieve the mailbox associated to the given name */ - static MailboxPtr by_name(const std::string& name); + /** Retrieve the mailbox associated to the given name. Mailboxes are created on demand. */ + static Mailbox* by_name(const std::string& name); /** Returns whether the mailbox contains queued communications */ - bool empty(); + bool empty() const; + + /* Returns the number of queued communications */ + size_t size() const; /** Check if there is a communication going on in a mailbox. */ - bool listen(); + bool listen() const; + + /** Look if there is a communication going on in a mailbox and return the PID of the sender actor */ + aid_t listen_from() const; /** Check if there is a communication ready to be consumed from a mailbox. */ - bool ready(); + bool ready() const; /** Gets the first element in the queue (without dequeuing it), or nullptr if none is there */ - kernel::activity::CommImplPtr front(); + kernel::activity::CommImplPtr front() const; /** Declare that the specified actor is a permanent receiver on that mailbox * @@ -67,71 +76,80 @@ public: * Note that being permanent receivers of a mailbox prevents actors to be garbage-collected. * If your simulation creates many short-lived actors that marked as permanent receiver, you * should call mailbox->set_receiver(nullptr) by the end of the actors so that their memory gets - * properly reclaimed. This call should be at the end of the actor's function, not in a on_exit + * properly reclaimed. This call should be at the end of the actor's function, not in an on_exit * callback. */ void set_receiver(ActorPtr actor); /** Return the actor declared as permanent receiver, or nullptr if none **/ - ActorPtr get_receiver(); + ActorPtr get_receiver() const; /** Creates (but don't start) a data transmission to that mailbox */ CommPtr put_init(); - /** Creates (but don't start) a data transmission to that mailbox */ + /** Creates (but don't start) a data transmission to that mailbox. + * + * Please note that if you send a pointer to some data, you must ensure that your data remains live during the + * communication, or the receiver will get a pointer to a garbled memory area. + */ CommPtr put_init(void* data, uint64_t simulated_size_in_bytes); - /** Creates and start a data transmission to that mailbox */ + /** Creates and start a data transmission to that mailbox. + * + * Please note that if you send a pointer to some data, you must ensure that your data remains live during the + * communication, or the receiver will get a pointer to a garbled memory area. + */ CommPtr put_async(void* data, uint64_t simulated_size_in_bytes); - smx_activity_t iprobe(int type, int (*match_fun)(void*, void*, kernel::activity::CommImpl*), void* data); - /** Blocking data transmission */ + kernel::activity::ActivityImplPtr + iprobe(int type, const std::function& match_fun, void* data); + /** Blocking data transmission. + * + * Please note that if you send a pointer to some data, you must ensure that your data remains live during the + * communication, or the receiver will get a pointer to a garbled memory area. + */ void put(void* payload, uint64_t simulated_size_in_bytes); /** Blocking data transmission with timeout */ void put(void* payload, uint64_t simulated_size_in_bytes, double timeout); - /** Creates (but don't start) a data reception onto that mailbox */ + /** Creates (but don't start) a data reception onto that mailbox. + * @verbatim embed:rst:inline You probably want to use :cpp:func:`simgrid::s4u::Comm::set_dst_data` and friends before + * starting that activity. @endverbatim */ CommPtr get_init(); /** Creates and start an async data reception to that mailbox */ - CommPtr get_async(void** data); + template CommPtr get_async(T** data); /** Blocking data reception */ - void* get(); // FIXME: make a typed template version + template T* get(); + template std::unique_ptr get_unique() { return std::unique_ptr(get()); } + /** Blocking data reception with timeout */ - void* get(double timeout); + template T* get(double timeout); + template std::unique_ptr get_unique(double timeout) { return std::unique_ptr(get(timeout)); } - // Deprecated functions -#ifndef DOXYGEN - /** @deprecated Mailbox::set_receiver() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Mailbox::set_receiver()") void setReceiver(ActorPtr actor) - { - set_receiver(actor); - } - /** @deprecated Mailbox::get_receiver() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Mailbox::get_receiver()") ActorPtr getReceiver() { return get_receiver(); } - /** @deprecated Mailbox::get_name() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Mailbox::get_name()") const simgrid::xbt::string& getName() const - { - return get_name(); - } - /** @deprecated Mailbox::get_cname() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Mailbox::get_cname()") const char* getCname() const { return get_cname(); } - /** @deprecated Mailbox::get_impl() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Mailbox::get_impl()") kernel::activity::MailboxImpl* getImpl() - { - return get_impl(); - } - /** @deprecated Mailbox::by_name() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Mailbox::by_name()") static MailboxPtr byName(const char* name) - { - return by_name(name); - } - /** @deprecated Mailbox::by_name() */ - XBT_ATTRIB_DEPRECATED_v323("Please use Mailbox::by_name()") static MailboxPtr byName(std::string name) - { - return by_name(name); - } -#endif + void clear(); + }; -}} // namespace simgrid::s4u +template CommPtr Mailbox::get_async(T** data) +{ + CommPtr res = get_init()->set_dst_data(reinterpret_cast(data), sizeof(void*)); + res->vetoable_start(); + return res; +} + +template T* Mailbox::get() +{ + T* res = nullptr; + get_async(&res)->wait(); + return res; +} + +template T* Mailbox::get(double timeout) +{ + T* res = nullptr; + get_async(&res)->wait_for(timeout); + return res; +} +} // namespace s4u +} // namespace simgrid #endif /* SIMGRID_S4U_MAILBOX_HPP */