X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a2a013c0e4ca407feeb7b3d0e85abba7acae2532..7ba9ddb2180684b3fe1ab8e70b854d3f8558d8dc:/src/simix/smx_network_private.h

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index 630fa4e24c..e40096bad8 100644
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -7,54 +7,16 @@
 #ifndef _SIMIX_NETWORK_PRIVATE_H
 #define _SIMIX_NETWORK_PRIVATE_H
 
-#include <deque>
-#include <string>
-
-#include <boost/intrusive_ptr.hpp>
-
-#include <xbt/base.h>
-
-#include <simgrid/s4u/mailbox.hpp>
-
-#include "simgrid/simix.h"
-#include "popping_private.h"
+#include "simgrid/s4u/Mailbox.hpp"
 #include "src/simix/ActorImpl.hpp"
+#include "src/simix/MailboxImpl.hpp"
 
-namespace simgrid {
-namespace simix {
-
-/** @brief Rendez-vous point datatype */
-
-class Mailbox {
-public:
-  Mailbox(const char* name) : piface_(this), name(xbt_strdup(name)) {}
-  ~Mailbox() {
-    xbt_free(name);
-  }
-
-  simgrid::s4u::Mailbox piface_; // Our interface
-  char* name;
-  std::deque<smx_synchro_t> comm_queue;
-  boost::intrusive_ptr<simgrid::simix::ActorImpl> permanent_receiver; //process which the mailbox is attached to
-  std::deque<smx_synchro_t> done_comm_queue;//messages already received in the permanent receive mode
-};
-
-}
-}
-
-XBT_PRIVATE void SIMIX_mailbox_exit(void);
-
-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_synchro_t comm);
-
-XBT_PRIVATE void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t proc);
-XBT_PRIVATE smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox,
+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_synchro_t),
-                              void (*copy_data_fun)(smx_synchro_t, void*, size_t),
+                              int (*match_fun)(void *, void *, smx_activity_t),
+                              void (*copy_data_fun)(smx_activity_t, void*, size_t),
                               void *data, double rate);
-XBT_PRIVATE smx_synchro_t SIMIX_comm_iprobe(smx_process_t dst_proc, smx_mailbox_t mbox, int type, int src,
-                              int tag, int (*match_fun)(void *, void *, smx_synchro_t), void *data);
+XBT_PRIVATE smx_activity_t SIMIX_comm_iprobe(smx_actor_t dst_proc, smx_mailbox_t mbox, int type, int src,
+                              int tag, int (*match_fun)(void *, void *, smx_activity_t), void *data);
 
 #endif