-/*Not implemented yet */
-XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char * name,
- int workstation_nb,
- void **workstation_list,
- double *computation_amount,
- double *communication_amount,
- double amount,
- double rate);
-
-/* Helper functions for jMSG: manipulate the context data without breaking the module separation */
-void SIMIX_process_set_jprocess(smx_process_t process, void *jp);
-void* SIMIX_process_get_jprocess(smx_process_t process);
-void SIMIX_process_set_jmutex(smx_process_t process, void *jm);
-void* SIMIX_process_get_jmutex(smx_process_t process);
-void SIMIX_process_set_jcond(smx_process_t process, void *jc);
-void* SIMIX_process_get_jcond(smx_process_t process);
-void SIMIX_process_set_jenv(smx_process_t process, void *je);
-void* SIMIX_process_get_jenv(smx_process_t process);
-
+XBT_PUBLIC(smx_action_t) SIMIX_action_parallel_execute(char *name,
+ int host_nb,
+ smx_host_t * host_list,
+ double
+ *computation_amount, double
+ *communication_amount,
+ double amount,
+ double rate);
+
+XBT_PUBLIC(char *) SIMIX_action_get_name(smx_action_t action);
+XBT_PUBLIC(void) SIMIX_action_signal_all(smx_action_t action);
+XBT_PUBLIC(void) SIMIX_display_process_status(void);
+/************************** Comunication Handling *****************************/
+
+/* Public */
+XBT_PUBLIC(smx_rvpoint_t) SIMIX_rvpoint_create(char *name);
+XBT_PUBLIC(void) SIMIX_rvpoint_destroy(smx_rvpoint_t rvp);
+XBT_PUBLIC(void) SIMIX_network_send(smx_rvpoint_t rdv, void *data, size_t size, double rate, double timeout);
+XBT_PUBLIC(void) SIMIX_network_recv(smx_rvpoint_t rvp, void **data, size_t *size, double timeout);
+XBT_PUBLIC(void) SIMIX_network_wait(smx_action_t comm);
+XBT_PUBLIC(int) SIMIX_network_test(smx_action_t comm);
+
+/* These should be private to SIMIX */
+smx_comm_t SIMIX_communication_new(smx_host_t src_host, smx_host_t dst_host,
+ smx_rvpoint_t rdv);
+void SIMIX_communication_destroy(smx_comm_t comm);
+smx_comm_t SIMIX_rvpoint_get_receiver(smx_rvpoint_t rvp);
+smx_comm_t SIMIX_rvpoint_get_sender(smx_rvpoint_t rvp);
+static inline void SIMIX_rvpoint_push(smx_rvpoint_t rvp, smx_comm_t comm);
+static inline smx_cond_t SIMIX_rvpoint_get_cond(smx_rvpoint_t rvp);
+static inline smx_mutex_t SIMIX_rvpoint_get_comm_mutex(smx_rvpoint_t rvp);