X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3a637e72fc2e1a30daa00872a35cf382b5f1413a..3cc9325535240d20ab9eab51ad116889b53bf20e:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index 2d7db1e0be..16f4e12311 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -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); @@ -47,25 +47,25 @@ 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(void) MSG_process_kill(m_process_t process); -XBT_PUBLIC(int) MSG_process_killall(long int reset_PIDs); +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(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(long int PID); -XBT_PUBLIC(long int) MSG_process_get_PID(m_process_t process); -XBT_PUBLIC(long int) MSG_process_get_PPID(m_process_t process); +XBT_PUBLIC(m_process_t) MSG_process_from_PID(int PID); +XBT_PUBLIC(int) MSG_process_get_PID(m_process_t process); +XBT_PUBLIC(int) MSG_process_get_PPID(m_process_t process); XBT_PUBLIC(const char *)MSG_process_get_name(m_process_t process); -XBT_PUBLIC(long int) MSG_process_self_PID(void); -XBT_PUBLIC(long int) MSG_process_self_PPID(void); +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); XBT_PUBLIC(MSG_error_t) MSG_process_suspend(m_process_t process); @@ -106,10 +106,10 @@ XBT_PUBLIC(MSG_error_t) MSG_parallel_task_execute(m_task_t task); XBT_PUBLIC(void) MSG_task_set_priority(m_task_t task, double priority); XBT_PUBLIC(int) MSG_task_Iprobe(m_channel_t channel); -XBT_PUBLIC(long int) MSG_task_probe_from(m_channel_t channel); +XBT_PUBLIC(int) MSG_task_probe_from(m_channel_t channel); XBT_PUBLIC(int) MSG_task_probe_from_host(int channel, m_host_t host); XBT_PUBLIC(MSG_error_t) MSG_channel_select_from(m_channel_t channel, double max_duration, - long int *PID); + int *PID); XBT_PUBLIC(MSG_error_t) MSG_process_sleep(double nb_sec); XBT_PUBLIC(MSG_error_t) MSG_get_errno(void);