X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/94974c282c6e6d096238716853bb053330170d76..446516ef6cc8459883ad5b3a53cd724e24185c21:/src/simix/smx_network_private.h

diff --git a/src/simix/smx_network_private.h b/src/simix/smx_network_private.h
index 11b4cbbd9c..d14ec57ce5 100644
--- a/src/simix/smx_network_private.h
+++ b/src/simix/smx_network_private.h
@@ -7,7 +7,7 @@
 #ifndef _SIMIX_NETWORK_PRIVATE_H
 #define _SIMIX_NETWORK_PRIVATE_H
 
-#include "simix/datatypes.h"
+#include "simgrid/simix.h"
 #include "smx_smurf_private.h"
 
 /** @brief Rendez-vous point datatype */
@@ -27,36 +27,36 @@ XBT_INLINE XBT_PUBLIC(int) SIMIX_comm_is_latency_bounded(smx_action_t comm);
 smx_rdv_t SIMIX_rdv_create(const char *name);
 void SIMIX_rdv_destroy(smx_rdv_t rdv);
 smx_rdv_t SIMIX_rdv_get_by_name(const char *name);
-XBT_INLINE void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm);
+void SIMIX_rdv_remove(smx_rdv_t rdv, smx_action_t comm);
 int SIMIX_rdv_comm_count_by_host(smx_rdv_t rdv, smx_host_t host);
 smx_action_t SIMIX_rdv_get_head(smx_rdv_t rdv);
-XBT_INLINE void SIMIX_comm_start(smx_action_t action);
+void SIMIX_comm_start(smx_action_t action);
 void SIMIX_comm_send(smx_process_t src_proc, smx_rdv_t rdv,
                      double task_size, double rate,
                      void *src_buff, size_t src_buff_size,
-                     int (*)(void *, void *), void *data,
+                     int (*match_fun)(void *, void *,smx_action_t), void *data,
                      double timeout);
 smx_action_t SIMIX_comm_isend(smx_process_t src_proc, smx_rdv_t rdv,
                               double task_size, double rate,
                               void *src_buff, size_t src_buff_size,
-                              int (*)(void *, void *),
+                              int (*match_fun)(void *, void *, smx_action_t),
                               void (*clean_fun)(void *), // used to free the action in case of problem after a detached send
                               void *data,
                               int detached);
 void SIMIX_comm_recv(smx_process_t dst_proc, smx_rdv_t rdv,
                      void *dst_buff, size_t *dst_buff_size,
-                     int (*)(void *, void *), void *data,
+                     int (*)(void *, void *,smx_action_t), void *data,
                      double timeout);
 smx_action_t SIMIX_comm_irecv(smx_process_t dst_proc, smx_rdv_t rdv,
                               void *dst_buff, size_t *dst_buff_size,
-                              int (*)(void *, void *), void *data);
+                              int (*)(void *, void *, smx_action_t), void *data);
 void SIMIX_comm_destroy(smx_action_t action);
 void SIMIX_comm_destroy_internal_actions(smx_action_t action);
-void SIMIX_pre_comm_wait(smx_req_t req, smx_action_t action, double timeout, int idx);
-void SIMIX_pre_comm_waitany(smx_req_t req, int idx);
+void SIMIX_pre_comm_wait(smx_simcall_t simcall, smx_action_t action, double timeout, int idx);
+void SIMIX_pre_comm_waitany(smx_simcall_t simcall, int idx);
 void SIMIX_post_comm(smx_action_t action);
-void SIMIX_pre_comm_test(smx_req_t req);
-void SIMIX_pre_comm_testany(smx_req_t req, int idx);
+void SIMIX_pre_comm_test(smx_simcall_t simcall);
+void SIMIX_pre_comm_testany(smx_simcall_t simcall, int idx);
 void SIMIX_comm_cancel(smx_action_t action);
 double SIMIX_comm_get_remains(smx_action_t action);
 e_smx_state_t SIMIX_comm_get_state(smx_action_t action);