X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/621e3b159443376a40ff174a1a30815bf265c0ac..53d5b9cddd039beaaad10e83960da1b4bc7b1823:/include/msg/msg.h diff --git a/include/msg/msg.h b/include/msg/msg.h index 4d3bc10a5a..dfdb2a499e 100644 --- a/include/msg/msg.h +++ b/include/msg/msg.h @@ -12,6 +12,8 @@ #include "msg/datatypes.h" #include "xbt/automaton.h" +#include "simgrid/simix.h" + SG_BEGIN_DECL() /** @brief Return code of most MSG functions @@ -100,7 +102,6 @@ XBT_PUBLIC(m_process_t) MSG_process_create_with_environment(const char code, void *data, m_host_t host, - double kill_time, int argc, char **argv, xbt_dict_t @@ -123,6 +124,7 @@ 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(xbt_dynar_t) MSG_processes_as_dynar(void); +XBT_PUBLIC(MSG_error_t) MSG_process_set_kill_time(m_process_t process, double kill_time); /*property handlers*/ XBT_PUBLIC(xbt_dict_t) MSG_process_get_properties(m_process_t process); @@ -192,7 +194,7 @@ XBT_PUBLIC(MSG_error_t) XBT_PUBLIC(msg_comm_t) MSG_task_isend(m_task_t task, const char *alias); XBT_PUBLIC(msg_comm_t) MSG_task_isend_with_matching(m_task_t task, const char *alias, - int (*match_fun)(void*,void*), + int (*match_fun)(void*,void*, smx_action_t), void *match_data); XBT_PUBLIC(void) MSG_task_dsend(m_task_t task, const char *alias, void_f_pvoid_t cleanup); @@ -286,7 +288,6 @@ XBT_PUBLIC(int) MSG_get_channel_number(void); #include "instr/instr.h" /* Used only by the bindings */ -#include "simix/simix.h" XBT_PUBLIC(smx_context_t) MSG_process_get_smx_ctx(m_process_t process); SG_END_DECL()