-XBT_PUBLIC(smx_action_t) SIMIX_communicate(smx_host_t sender,smx_host_t receiver, char *name, double size, double rate);
-XBT_PUBLIC(smx_action_t) SIMIX_execute(smx_host_t host,char *name, double amount);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_action_cancel(smx_action_t action);
-XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action, double priority);
-XBT_PUBLIC(SIMIX_error_t) SIMIX_action_destroy(smx_action_t action);
-XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action, smx_cond_t cond);
-XBT_PUBLIC(void) SIMIX_register_condition_to_action(smx_action_t action, smx_cond_t cond);
-
-//SIMIX_action_wait_for_computation(smx_process_t process, smx_action_t action);
+XBT_PUBLIC(smx_action_t) SIMIX_action_communicate(smx_host_t sender,
+ smx_host_t receiver,
+ const char *name,
+ double size, double rate);
+XBT_PUBLIC(smx_action_t) SIMIX_action_execute(smx_host_t host,
+ const char *name,
+ double amount);
+XBT_PUBLIC(smx_action_t) SIMIX_action_sleep(smx_host_t host, double amount);
+XBT_PUBLIC(void) SIMIX_action_cancel(smx_action_t action);
+XBT_PUBLIC(void) SIMIX_action_set_priority(smx_action_t action,
+ double priority);
+XBT_PUBLIC(int) SIMIX_action_destroy(smx_action_t action);
+XBT_PUBLIC(void) SIMIX_action_use(smx_action_t action);
+XBT_PUBLIC(void) SIMIX_action_release(smx_action_t action);
+XBT_PUBLIC(void) SIMIX_register_action_to_condition(smx_action_t action,
+ smx_cond_t cond);
+XBT_PUBLIC(void) SIMIX_unregister_action_to_condition(smx_action_t action,
+ smx_cond_t cond);
+XBT_PUBLIC(double) SIMIX_action_get_remains(smx_action_t action);
+
+XBT_PUBLIC(e_surf_action_state_t) SIMIX_action_get_state(smx_action_t action);
+
+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);