X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e276e9953a9ab5894bbb623fc17ec79512efab5d..1c6ecd7825422241dd932318a4ba03c3df1de985:/src/simix/network_private.h

diff --git a/src/simix/network_private.h b/src/simix/network_private.h
index 845eba2667..bf82a50673 100644
--- a/src/simix/network_private.h
+++ b/src/simix/network_private.h
@@ -21,35 +21,49 @@ void SIMIX_network_init(void);
 void SIMIX_network_exit(void);
 
 #ifdef HAVE_LATENCY_BOUND_TRACKING
-XBT_PUBLIC(int) SIMIX_comm_is_latency_bounded(smx_action_t comm);
+XBT_INLINE XBT_PUBLIC(int) SIMIX_comm_is_latency_bounded(smx_action_t comm);
 #endif
 
 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);
 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_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,
+                     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, void *data);
+                              void *src_buff, size_t src_buff_size,
+                              int (*)(void *, void *),
+                              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,
+                     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);
+                              void *dst_buff, size_t *dst_buff_size,
+                              int (*)(void *, void *), 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);
-void SIMIX_pre_comm_waitany(smx_req_t req);
+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_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_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);
 void SIMIX_comm_suspend(smx_action_t action);
 void SIMIX_comm_resume(smx_action_t action);
-void* SIMIX_comm_get_data(smx_action_t action);
-void* SIMIX_comm_get_src_buff(smx_action_t action);
-void* SIMIX_comm_get_dst_buff(smx_action_t action);
-size_t SIMIX_comm_get_src_buff_size(smx_action_t action);
-size_t SIMIX_comm_get_dst_buff_size(smx_action_t action);
+void* SIMIX_comm_get_src_data(smx_action_t action);
+void* SIMIX_comm_get_dst_data(smx_action_t action);
 smx_process_t SIMIX_comm_get_src_proc(smx_action_t action);
 smx_process_t SIMIX_comm_get_dst_proc(smx_action_t action);