X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ad5365a072943b2b0bacc486fa504e93a99ea940..648ef671efa341346c38df5f27d10a530119108f:/include/msg/msg.h

diff --git a/include/msg/msg.h b/include/msg/msg.h
index 22a02cc226..eacf0811d3 100644
--- a/include/msg/msg.h
+++ b/include/msg/msg.h
@@ -8,7 +8,7 @@
 #ifndef MSG_H
 #define MSG_H
 
-#include "xbt/misc.h"
+#include "xbt.h"
 
 #include "msg/datatypes.h"
 SG_BEGIN_DECL()
@@ -22,8 +22,8 @@ XBT_PUBLIC(MSG_error_t) MSG_set_channel_number(int number);
 XBT_PUBLIC(int) MSG_get_channel_number(void);
 XBT_PUBLIC(MSG_error_t) MSG_main(void);
 XBT_PUBLIC(MSG_error_t) MSG_clean(void);
-XBT_PUBLIC(void) MSG_function_register(const char *name, m_process_code_t code);
-XBT_PUBLIC(m_process_code_t) MSG_get_registered_function(const char *name);
+XBT_PUBLIC(void) MSG_function_register(const char *name, xbt_main_func_t code);
+XBT_PUBLIC(xbt_main_func_t) MSG_get_registered_function(const char *name);
 XBT_PUBLIC(void) MSG_launch_application(const char *file);
 XBT_PUBLIC(void) MSG_paje_output(const char *filename);
 
@@ -31,7 +31,7 @@ XBT_PUBLIC(double) MSG_get_clock(void);
 
 /************************** Host handling ***********************************/
 XBT_PUBLIC(MSG_error_t) MSG_host_set_data(m_host_t host, void *data);
-XBT_PUBLIC(void) *MSG_host_get_data(m_host_t host);
+XBT_PUBLIC(void*) MSG_host_get_data(m_host_t host);
 XBT_PUBLIC(const char *) MSG_host_get_name(m_host_t host);
 XBT_PUBLIC(m_host_t) MSG_host_self(void);
 XBT_PUBLIC(int) MSG_get_host_msgload(m_host_t host);
@@ -39,6 +39,10 @@ XBT_PUBLIC(int) MSG_get_host_msgload(m_host_t host);
 XBT_PUBLIC(double) MSG_get_host_speed(m_host_t h);
 XBT_PUBLIC(int) MSG_host_is_avail (m_host_t h);
 
+/*property handlers*/
+XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(m_host_t host);
+XBT_PUBLIC(const char*) MSG_host_get_property_value(m_host_t host, const char* name);
+
 XBT_PUBLIC(void) MSG_create_environment(const char *file);
 
 XBT_PUBLIC(m_host_t) MSG_get_host_by_name(const char *name);
@@ -47,17 +51,20 @@ XBT_PUBLIC(m_host_t *)MSG_get_host_table(void);
 
 /************************** Process handling *********************************/
 XBT_PUBLIC(m_process_t) MSG_process_create(const char *name,
-			       m_process_code_t code, void *data,
+			       xbt_main_func_t code, void *data,
 			       m_host_t host);
 XBT_PUBLIC(m_process_t) MSG_process_create_with_arguments(const char *name,
-					      m_process_code_t code, void *data,
+					      xbt_main_func_t code, void *data,
 					      m_host_t host, int argc, char **argv);
+XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char *name,
+					      xbt_main_func_t code, void *data,
+					      m_host_t host, int argc, char **argv, xbt_dict_t properties);
 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(void) *MSG_process_get_data(m_process_t process);
+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);
 XBT_PUBLIC(m_host_t) MSG_process_get_host(m_process_t process);
 XBT_PUBLIC(m_process_t) MSG_process_from_PID(int PID);
@@ -68,6 +75,10 @@ XBT_PUBLIC(int) MSG_process_self_PID(void);
 XBT_PUBLIC(int) MSG_process_self_PPID(void);
 XBT_PUBLIC(m_process_t) MSG_process_self(void);
 
+/*property handlers*/
+XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(m_process_t process);
+XBT_PUBLIC(const char*) MSG_process_get_property_value(m_process_t process, const char* name);
+
 XBT_PUBLIC(MSG_error_t) MSG_process_suspend(m_process_t process);
 XBT_PUBLIC(MSG_error_t) MSG_process_resume(m_process_t process);
 XBT_PUBLIC(int) MSG_process_is_suspended(m_process_t process);
@@ -90,10 +101,14 @@ 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,
-				       double max_duration);
+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);
+					       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);
+
+
 XBT_PUBLIC(MSG_error_t) MSG_task_put(m_task_t task, m_host_t dest, 
 			 m_channel_t channel);
 XBT_PUBLIC(MSG_error_t) MSG_task_put_bounded(m_task_t task,
@@ -117,5 +132,36 @@ 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_data_size(m_task_t task);
 
+
+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_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);
+
+XBT_PUBLIC(int) 
+MSG_task_listen(const char* alias);
+
+XBT_PUBLIC(int) 
+MSG_task_listen_from_host(const char* alias, m_host_t host);
+
+XBT_PUBLIC(MSG_error_t) 
+MSG_alias_select_from(const char* alias, double timeout, int* PID);
+
+XBT_PUBLIC(MSG_error_t) 
+MSG_task_send_with_timeout(m_task_t task, const char* alias, double timeout);
+
+XBT_PUBLIC(MSG_error_t) 
+MSG_task_send(m_task_t task,const char* alias);
+
+XBT_PUBLIC(MSG_error_t) 
+MSG_task_send_bounded(m_task_t task, const char* alias, double rate);
+
+XBT_PUBLIC(int)
+MSG_task_listen_from(const char* alias);
+
 SG_END_DECL()
 #endif