#include <string>
-#include <boost/intrusive_ptr.hpp>
-
#include <xbt/base.h>
#include <simgrid/s4u/forward.hpp>
-#include <simgrid/s4u/actor.hpp>
+#include <simgrid/s4u/Actor.hpp>
namespace simgrid {
namespace s4u {
friend simgrid::s4u::Engine;
friend simgrid::simix::Mailbox;
- smx_mailbox_t pimpl_;
+ simgrid::simix::Mailbox *pimpl_;
Mailbox(smx_mailbox_t mbox): pimpl_(mbox) {}
-protected:
- smx_mailbox_t getImpl() { return pimpl_; }
-
-public:
-
// We don't have to manage the lifetime of mailboxes:
friend void intrusive_ptr_add_ref(Mailbox*) {}
friend void intrusive_ptr_release(Mailbox*) {}
- using Ptr = boost::intrusive_ptr<Mailbox>;
+public:
+ smx_mailbox_t getImpl() { return pimpl_; } // FIXME: make me protected
+
/** Get the name of that mailbox */
const char *getName();
- /** Retrieve the mailbox associated to the given string */
- static Ptr byName(const char *name);
+ /** Retrieve the mailbox associated to the given string (as a C string) */
+ static MailboxPtr byName(const char *name);
+
+ /** Retrieve the mailbox associated to the given string (as a C++ string) */
+ static MailboxPtr byName(std::string name);
/** Returns whether the mailbox contains queued communications */
bool empty();
+ /** Returns the first element in the queue, or nullptr if none is there */
+ smx_activity_t front();
+
/** Declare that the specified process is a permanent receiver on that mailbox
*
- * It means that the communications sent to this mailbox will start flowing to its host even before he does a recv().
- * This models the real behavior of TCP and MPI communications, amongst other.
+ * It means that the communications sent to this mailbox will start flowing to
+ * its host even before he does a recv(). This models the real behavior of TCP
+ * and MPI communications, amongst other.
*/
- void setReceiver(Actor* process);
+ void setReceiver(ActorPtr process);
/** Return the process declared as permanent receiver, or nullptr if none **/
ActorPtr receiver();
};
-using MailboxPtr = Mailbox::Ptr;
-
}} // namespace simgrid::s4u
-XBT_PUBLIC(sg_mbox_t) sg_mbox_by_name(const char*name);
-XBT_PUBLIC(int) sg_mbox_is_empty(sg_mbox_t mbox);
-XBT_PUBLIC(void)sg_mbox_setReceiver(sg_mbox_t mbox, smx_process_t process);
-
#endif /* SIMGRID_S4U_MAILBOX_HPP */