X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8449f8cd86a230453d0621072573d85c7ac611f4..ed8f133b3bcee22984faa7d3ed48340ba4f9f68c:/include/msg/msg.h?ds=sidebyside diff --git a/include/msg/msg.h b/include/msg/msg.h index 630e64b1ab..ea1e2a881d 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -23,8 +23,7 @@ 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_main_stateful(void); -XBT_PUBLIC(MSG_error_t) MSG_main_liveness_stateful(xbt_automaton_t a); -XBT_PUBLIC(MSG_error_t) MSG_main_liveness_stateless(xbt_automaton_t a, char *prgm); +XBT_PUBLIC(MSG_error_t) MSG_main_liveness(xbt_automaton_t a, char *prgm); XBT_PUBLIC(MSG_error_t) MSG_clean(void); XBT_PUBLIC(void) MSG_function_register(const char *name, xbt_main_func_t code); @@ -91,6 +90,7 @@ XBT_PUBLIC(MSG_error_t) MSG_process_migrate(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(void) MSG_process_set_data_cleanup(void_f_pvoid_t data_cleanup); XBT_PUBLIC(m_host_t) MSG_process_get_host(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); @@ -123,6 +123,8 @@ XBT_PUBLIC(m_task_t) MSG_parallel_task_create(const char *name, void *data); XBT_PUBLIC(void *) MSG_task_get_data(m_task_t task); XBT_PUBLIC(void) MSG_task_set_data(m_task_t task, void *data); +XBT_PUBLIC(void) MSG_task_set_copy_callback(void (*callback) ( + m_task_t task, m_process_t src, m_process_t dst)); XBT_PUBLIC(m_process_t) MSG_task_get_sender(m_task_t task); XBT_PUBLIC(m_host_t) MSG_task_get_source(m_task_t task); XBT_PUBLIC(const char *) MSG_task_get_name(m_task_t task); @@ -161,7 +163,6 @@ XBT_PUBLIC(int) MSG_task_Iprobe(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_process_sleep(double nb_sec); -XBT_PUBLIC(MSG_error_t) MSG_get_errno(void); XBT_PUBLIC(double) MSG_task_get_compute_duration(m_task_t task); XBT_PUBLIC(void) MSG_task_set_compute_duration(m_task_t task, @@ -182,6 +183,7 @@ XBT_PUBLIC(MSG_error_t) XBT_PUBLIC(MSG_error_t) MSG_task_receive(m_task_t * task, const char *alias); +#define MSG_task_recv(t,a) MSG_task_receive(t,a) XBT_PUBLIC(msg_comm_t) MSG_task_isend(m_task_t task, const char *alias); XBT_INLINE XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(m_task_t task, const char *alias, @@ -236,10 +238,12 @@ MSG_error_t MSG_action_trace_run(char *path); #ifdef MSG_USE_DEPRECATED /* these are the functions which are deprecated. Do not use them, they may get removed in future releases */ #define MSG_TIMEOUT_FAILURE MSG_TIMEOUT +#define MSG_TASK_CANCELLED MSG_TASK_CANCELED #define MSG_mailbox_put_with_time_out(mailbox, task, timeout) \ MSG_mailbox_put_with_timeout(mailbox, task, timeout) #define MSG_process_change_host(h) MSG_process_migrate(MSG_process_self(),h); +XBT_PUBLIC(MSG_error_t) MSG_get_errno(void); #endif #include "instr/instr.h"