X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4eaa0006578ba94dd98c4a74d48169f75912d855..3c0ec158c879d3ad3891ee9cb05304b8fff0255f:/src/simix/smx_network_private.h diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index cf5651883d..c238e2e298 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -7,48 +7,10 @@ #ifndef _SIMIX_NETWORK_PRIVATE_H #define _SIMIX_NETWORK_PRIVATE_H -#include - -#include -#include - -#include - -#include - -#include "simgrid/simix.h" -#include "popping_private.h" +#include "simgrid/s4u/Mailbox.hpp" +#include "src/kernel/activity/MailboxImpl.hpp" #include "src/simix/ActorImpl.hpp" -namespace simgrid { -namespace simix { - -/** @brief Rendez-vous point datatype */ - -class Mailbox { -public: - Mailbox(const char* name) : piface_(this), name(xbt_strdup(name)), comm_queue(1000), done_comm_queue(1000) {} - ~Mailbox() { - xbt_free(name); - } - - simgrid::s4u::Mailbox piface_; // Our interface - char* name; - boost::circular_buffer_space_optimized comm_queue; - boost::intrusive_ptr permanent_receiver; //process which the mailbox is attached to - boost::circular_buffer_space_optimized done_comm_queue;//messages already received in the permanent receive mode -}; - -} -} - -XBT_PRIVATE void SIMIX_mailbox_exit(); - -XBT_PRIVATE smx_mailbox_t SIMIX_mbox_create(const char *name); -XBT_PRIVATE smx_mailbox_t SIMIX_mbox_get_by_name(const char *name); -XBT_PRIVATE void SIMIX_mbox_remove(smx_mailbox_t mbox, smx_activity_t comm); - -XBT_PRIVATE void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_actor_t proc); XBT_PRIVATE smx_activity_t SIMIX_comm_irecv(smx_actor_t dst_proc, smx_mailbox_t mbox, void *dst_buff, size_t *dst_buff_size, int (*match_fun)(void *, void *, smx_activity_t),