[Cristian] Lots and lots of small fixes to MSG to work on top of SMX net keeping...

[simgrid.git] / src / include / simix / simix.h

diff --git a/src/include/simix/simix.h b/src/include/simix/simix.h
index 9479cdb..7b8ce2d 100644 (file)
--- a/src/include/simix/simix.h
+++ b/src/include/simix/simix.h
@@ -178,13 +178,17 @@ XBT_PUBLIC(void) SIMIX_display_process_status(void);
 XBT_PUBLIC(smx_rdv_t) SIMIX_rdv_create(const char *name);
 XBT_PUBLIC(void) SIMIX_rdv_destroy(smx_rdv_t rvp);
 XBT_PUBLIC(void) SIMIX_network_send(smx_rdv_t rdv, double task_size, double rate,
-                                    double timeout, void *data, size_t data_size);
-XBT_PUBLIC(void) SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *data,
-                                    size_t *data_size);
+                                    double timeout, void *src_buff,
+                                    size_t src_buff_size, smx_comm_t *comm, void *data);
+XBT_PUBLIC(void) SIMIX_network_recv(smx_rdv_t rdv, double timeout, void *dst_buff,
+                                    size_t *dst_buff_size, smx_comm_t *comm);
 XBT_PUBLIC(void) SIMIX_network_wait(smx_action_t comm);
 XBT_PUBLIC(int) SIMIX_network_test(smx_action_t comm);
-XBT_PUBLIC(int) SIMIX_communication_isSend(smx_comm_t comm);
-XBT_PUBLIC(int) SIMIX_communication_isRecv(smx_comm_t comm);
+XBT_PUBLIC(void) SIMIX_communication_cancel(smx_comm_t comm);
+XBT_PUBLIC(double) SIMIX_communication_get_remains(smx_comm_t comm);
+XBT_PUBLIC(int) SIMIX_rdv_get_count_waiting_comm(smx_rdv_t rdv, smx_host_t host);
+XBT_PUBLIC(smx_comm_t) SIMIX_rdv_get_head(smx_rdv_t rdv);
+XBT_PUBLIC(void *) SIMIX_communication_get_data(smx_comm_t comm);
 
 /* These should be private to SIMIX */
 smx_comm_t SIMIX_communication_new(smx_comm_type_t type);