#ifndef _SIMIX_NETWORK_PRIVATE_H
#define _SIMIX_NETWORK_PRIVATE_H
-#include <deque>
+#include <string>
+
+#include <boost/intrusive_ptr.hpp>
+#include <boost/circular_buffer.hpp>
+
#include <xbt/base.h>
+#include <simgrid/s4u/Mailbox.hpp>
+
#include "simgrid/simix.h"
#include "popping_private.h"
+#include "src/simix/ActorImpl.hpp"
+
+
+#define MAX_MAILBOX_SIZE 10000000
+namespace simgrid {
+namespace simix {
/** @brief Rendez-vous point datatype */
-typedef struct s_smx_mailbox {
- char *name;
- std::deque<smx_synchro_t> *comm_queue;
- smx_process_t 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
-} s_smx_mailbox_t;
-XBT_PRIVATE void SIMIX_mailbox_exit(void);
+class Mailbox {
+public:
+ Mailbox(const char* name) : piface_(this), name(xbt_strdup(name)), comm_queue(MAX_MAILBOX_SIZE), done_comm_queue(MAX_MAILBOX_SIZE) {}
+ ~Mailbox() {
+ xbt_free(name);
+ }
+
+ simgrid::s4u::Mailbox piface_; // Our interface
+ char* name;
+ boost::circular_buffer_space_optimized<smx_activity_t> comm_queue;
+ boost::intrusive_ptr<simgrid::simix::ActorImpl> permanent_receiver; //process which the mailbox is attached to
+ boost::circular_buffer_space_optimized<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_synchro_t comm);
+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_process_t proc);
-XBT_PRIVATE smx_synchro_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_mailbox_t mbox,
+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 (*)(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
-
