clean treatment of timeouts and cond_free.

[simgrid.git] / include / msg / msg.h

diff --git a/include/msg/msg.h b/include/msg/msg.h
index cf80731..4fe9c1d 100644 (file)
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -62,7 +62,7 @@ XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char *name,
 XBT_PUBLIC(void) MSG_process_kill(m_process_t process);
 XBT_PUBLIC(int) MSG_process_killall(int reset_PIDs);
 
-XBT_PUBLIC(MSG_error_t) MSG_process_change_host(m_process_t process, m_host_t host);
+XBT_PUBLIC(MSG_error_t) MSG_process_change_host(m_host_t host);
 
 XBT_PUBLIC(void*) MSG_process_get_data(m_process_t process);
 XBT_PUBLIC(MSG_error_t) MSG_process_set_data(m_process_t process, void *data);
@@ -101,10 +101,12 @@ XBT_PUBLIC(MSG_error_t) MSG_task_cancel(m_task_t task);
 XBT_PUBLIC(MSG_error_t) MSG_task_destroy(m_task_t task);
 
 XBT_PUBLIC(MSG_error_t) MSG_task_get(m_task_t * task, m_channel_t channel);
-XBT_PUBLIC(MSG_error_t) MSG_task_get_with_time_out(m_task_t * task, m_channel_t channel,
+XBT_PUBLIC(MSG_error_t) MSG_task_get_with_timeout(m_task_t * task, m_channel_t channel,
                                                   double max_duration);
 XBT_PUBLIC(MSG_error_t) MSG_task_get_from_host(m_task_t * task, int channel, 
                                               m_host_t host);
+MSG_error_t 
+MSG_task_receive_from_host(m_task_t * task, const char* alias, m_host_t host);
 XBT_PUBLIC(MSG_error_t) MSG_task_get_ext(m_task_t * task, int channel, 
                                         double max_duration, m_host_t host);
 
@@ -130,6 +132,7 @@ XBT_PUBLIC(MSG_error_t) MSG_get_errno(void);
 
 XBT_PUBLIC(double) MSG_task_get_compute_duration(m_task_t task);
 XBT_PUBLIC(double) MSG_task_get_remaining_computation(m_task_t task);
+XBT_PUBLIC(double) MSG_task_get_remaining_communication(m_task_t task);
 XBT_PUBLIC(double) MSG_task_get_data_size(m_task_t task);
 
 
@@ -137,7 +140,7 @@ XBT_PUBLIC(MSG_error_t)
 MSG_task_receive_ext(m_task_t* task, const char* alias, double timeout, m_host_t host);
 
 XBT_PUBLIC(MSG_error_t) 
-MSG_task_receive_with_time_out(m_task_t * task, const char* alias, double timeout);
+MSG_task_receive_with_timeout(m_task_t * task, const char* alias, double timeout);
 
 XBT_PUBLIC(MSG_error_t) 
 MSG_task_receive(m_task_t * task, const char* alias);
@@ -163,5 +166,12 @@ MSG_task_send_bounded(m_task_t task, const char* alias, double rate);
 XBT_PUBLIC(int)
 MSG_task_listen_from(const char* alias);
 
+/************************** Task handling ************************************/
+XBT_PUBLIC(MSG_error_t)
+MSG_mailbox_get_task_ext(msg_mailbox_t mailbox, m_task_t* task, m_host_t host, double timeout);
+
+XBT_PUBLIC(MSG_error_t)
+MSG_mailbox_put_with_timeout(msg_mailbox_t mailbox, m_task_t task, double timeout);
+
 SG_END_DECL()
 #endif