-typedef struct s_smx_rvpoint {
- char *name;
- xbt_fifo_t comm_fifo;
- void *data;
- smx_process_t permanent_receiver; //process which the mailbox is attached to
- xbt_fifo_t done_comm_fifo;//messages already received in the permanent receive mode
-} s_smx_rvpoint_t;
-
-XBT_PRIVATE void SIMIX_network_init(void);
-XBT_PRIVATE void SIMIX_network_exit(void);
-
-XBT_PRIVATE smx_mailbox_t SIMIX_rdv_create(const char *name);
-XBT_PRIVATE void SIMIX_rdv_destroy(smx_mailbox_t rdv);
-XBT_PRIVATE smx_mailbox_t SIMIX_rdv_get_by_name(const char *name);
-XBT_PRIVATE void SIMIX_rdv_remove(smx_mailbox_t rdv, smx_synchro_t comm);
-XBT_PRIVATE int SIMIX_rdv_comm_count_by_host(smx_mailbox_t rdv, sg_host_t host);
-XBT_PRIVATE smx_synchro_t SIMIX_rdv_get_head(smx_mailbox_t rdv);
-XBT_PRIVATE void SIMIX_rdv_set_receiver(smx_mailbox_t rdv, smx_process_t proc);
-XBT_PRIVATE smx_process_t SIMIX_rdv_get_receiver(smx_mailbox_t rdv);
-XBT_PRIVATE smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t rdv,
+
+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_activity_t> comm_queue;
+ boost::intrusive_ptr<simgrid::simix::ActorImpl> permanent_receiver; //process which the mailbox is attached to
+ std::deque<smx_activity_t> 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,