X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/094c97e3586d1703f0d01e539b2570b535ccbe2b..557ed971e421202649b659e777722dab3e5e1eb1:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index a27b6e0adb..70a37322b5 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -44,6 +44,7 @@ XBT_PUBLIC(int) MSG_get_host_msgload(m_host_t host); /* int MSG_get_msgload(void); This function lacks specification; discard it */ XBT_PUBLIC(double) MSG_get_host_speed(m_host_t h); XBT_PUBLIC(int) MSG_host_is_avail(m_host_t h); +XBT_PUBLIC(void) __MSG_host_destroy(m_host_t host); /*property handlers*/ XBT_PUBLIC(xbt_dict_t) MSG_host_get_properties(m_host_t host); @@ -80,7 +81,7 @@ XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char 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_host_t host); +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, @@ -178,6 +179,11 @@ XBT_PUBLIC(MSG_error_t) MSG_task_receive(m_task_t * task, const char *alias); 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, + int (*match_fun)(void*,void*), + void *match_data); + +XBT_PUBLIC(void) MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup); XBT_PUBLIC(msg_comm_t) MSG_task_irecv(m_task_t * task, const char *alias); XBT_PUBLIC(int) MSG_comm_test(msg_comm_t comm); XBT_PUBLIC(int) MSG_comm_testany(xbt_dynar_t comms); @@ -187,6 +193,7 @@ XBT_PUBLIC(void) MSG_comm_waitall(msg_comm_t * comm, int nb_elem, double timeout); XBT_PUBLIC(int) MSG_comm_waitany(xbt_dynar_t comms); XBT_PUBLIC(m_task_t) MSG_comm_get_task(msg_comm_t comm); +XBT_PUBLIC(MSG_error_t) MSG_comm_get_status(msg_comm_t comm); XBT_PUBLIC(int) MSG_task_listen(const char *alias); @@ -215,19 +222,19 @@ XBT_PUBLIC(MSG_error_t) double timeout); /************************** Action handling **********************************/ -typedef void (*msg_action_fun) (char*const* args); +typedef void (*msg_action_fun) (const char *const *args); XBT_PUBLIC(void) MSG_action_register(const char *action_name, msg_action_fun function); XBT_PUBLIC(void) MSG_action_unregister(const char *action_name); 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_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); #endif #include "instr/instr.h" @@ -236,6 +243,5 @@ MSG_error_t MSG_action_trace_run(char *path); #include "simix/simix.h" XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(m_process_t process); - SG_END_DECL() #endif