X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aa67057cbae409c22a57e9dcf4d82a2859e97f45..504a11c1ce9879b4bf07ed7ad4e29278b1b8fecc:/include/simgrid/s4u/Mailbox.hpp diff --git a/include/simgrid/s4u/Mailbox.hpp b/include/simgrid/s4u/Mailbox.hpp index 687e78393c..8b4267a86f 100644 --- a/include/simgrid/s4u/Mailbox.hpp +++ b/include/simgrid/s4u/Mailbox.hpp @@ -122,10 +122,7 @@ public: /** @brief Retrieves the name of that mailbox as a C string */ const char* get_cname() const; - /** Retrieve the mailbox associated to the given C string */ - static MailboxPtr by_name(const char* name); - - /** Retrieve the mailbox associated to the given C++ string */ + /** Retrieve the mailbox associated to the given name */ static MailboxPtr by_name(std::string name); /** Returns whether the mailbox contains queued communications */ @@ -151,14 +148,14 @@ public: /** Creates (but don't start) a data emission to that mailbox */ CommPtr put_init(); /** Creates (but don't start) a data emission to that mailbox */ - CommPtr put_init(void* data, uint64_t simulatedSizeInBytes); + CommPtr put_init(void* data, uint64_t simulated_size_in_bytes); /** Creates and start a data emission to that mailbox */ - CommPtr put_async(void* data, uint64_t simulatedSizeInBytes); + CommPtr put_async(void* data, uint64_t simulated_size_in_bytes); /** Blocking data emission */ - void put(void* payload, uint64_t simulatedSizeInBytes); + void put(void* payload, uint64_t simulated_size_in_bytes); /** Blocking data emission with timeout */ - void put(void* payload, uint64_t simulatedSizeInBytes, double timeout); + void put(void* payload, uint64_t simulated_size_in_bytes, double timeout); /** Creates (but don't start) a data reception onto that mailbox */ CommPtr get_init(); @@ -171,24 +168,31 @@ public: void* get(double timeout); // Deprecated functions + /** @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);