X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/596294ab8f7a06cf75114739b574a013b60bb368..7076d70e9205a598bb96f6afca16d5d0456aeeb1:/src/simix/smx_network_private.h diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h index 80adafe7fb..a215ff2e01 100644 --- a/src/simix/smx_network_private.h +++ b/src/simix/smx_network_private.h @@ -7,6 +7,7 @@ #ifndef _SIMIX_NETWORK_PRIVATE_H #define _SIMIX_NETWORK_PRIVATE_H +#include #include #include "simgrid/simix.h" @@ -15,10 +16,9 @@ /** @brief Rendez-vous point datatype */ typedef struct s_smx_mailbox { char *name; - xbt_fifo_t comm_fifo; - void *data; + std::deque *comm_queue; 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 + std::deque *done_comm_queue;//messages already received in the permanent receive mode } s_smx_mailbox_t; XBT_PRIVATE void SIMIX_mailbox_exit(void); @@ -26,7 +26,6 @@ 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 int SIMIX_mbox_comm_count_by_host(smx_mailbox_t mbox, sg_host_t host); XBT_PRIVATE smx_synchro_t SIMIX_mbox_get_head(smx_mailbox_t mbox); XBT_PRIVATE void SIMIX_mbox_set_receiver(smx_mailbox_t mbox, smx_process_t proc); XBT_PRIVATE smx_process_t SIMIX_mbox_get_receiver(smx_mailbox_t mbox); @@ -40,11 +39,7 @@ XBT_PRIVATE void SIMIX_comm_destroy_internal_actions(smx_synchro_t synchro); 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 void SIMIX_post_comm(smx_synchro_t synchro); -XBT_PRIVATE void SIMIX_comm_cancel(smx_synchro_t synchro); XBT_PRIVATE double SIMIX_comm_get_remains(smx_synchro_t synchro); -XBT_PRIVATE e_smx_state_t SIMIX_comm_get_state(smx_synchro_t synchro); -XBT_PRIVATE void SIMIX_comm_suspend(smx_synchro_t synchro); -XBT_PRIVATE void SIMIX_comm_resume(smx_synchro_t synchro); XBT_PRIVATE smx_process_t SIMIX_comm_get_src_proc(smx_synchro_t synchro); XBT_PRIVATE smx_process_t SIMIX_comm_get_dst_proc(smx_synchro_t synchro);