X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ccd47bd5695175720f504772d3b2dfd517075639..9b605c24eb28349bfb6d61da080733e19a7cb9a2:/include/simix/simix.h diff --git a/include/simix/simix.h b/include/simix/simix.h index b0911f6466..8d7a03d582 100644 --- a/include/simix/simix.h +++ b/include/simix/simix.h @@ -24,7 +24,7 @@ XBT_PUBLIC(void) SIMIX_clean(void); XBT_PUBLIC(void) SIMIX_function_register_process_cleanup(void_pfn_smxprocess_t function); XBT_PUBLIC(void) SIMIX_function_register_process_create(smx_creation_func_t function); -XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_f_pvoid_t function); +XBT_PUBLIC(void) SIMIX_function_register_process_kill(void_pfn_smxprocess_t function); /* Simulation execution */ XBT_PUBLIC(void) SIMIX_run(void); @@ -63,8 +63,8 @@ XBT_PUBLIC(void*) SIMIX_host_self_get_data(void); XBT_PUBLIC(int) SIMIX_process_count(void); XBT_INLINE XBT_PUBLIC(smx_process_t) SIMIX_process_self(void); XBT_PUBLIC(const char*) SIMIX_process_self_get_name(void); -XBT_PUBLIC(void) SIMIX_process_self_set_data(void *data); -XBT_PUBLIC(void*) SIMIX_process_self_get_data(void); +XBT_PUBLIC(void) SIMIX_process_self_set_data(smx_process_t self, void *data); +XBT_PUBLIC(void*) SIMIX_process_self_get_data(smx_process_t self); XBT_PUBLIC(smx_context_t) SIMIX_process_get_context(smx_process_t); XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c); @@ -72,6 +72,10 @@ XBT_PUBLIC(void) SIMIX_process_set_context(smx_process_t p,smx_context_t c); XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_action_t, size_t)); XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_action_t comm, size_t buff_size); XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_action_t comm, size_t buff_size); +XBT_PUBLIC(smx_action_t) SIMIX_comm_get_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); +XBT_PUBLIC(int) SIMIX_comm_has_send_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); +XBT_PUBLIC(int) SIMIX_comm_has_recv_match(smx_rdv_t rdv, int (*match_fun)(void*, void*), void* data); +XBT_PUBLIC(void) SIMIX_comm_finish(smx_action_t action); /******************************************************************************/ /* SIMIX Smurf Proxy Functions */ @@ -125,11 +129,12 @@ XBT_PUBLIC(void) SIMIX_req_process_create(smx_process_t *process, xbt_dict_t properties); XBT_PUBLIC(void) SIMIX_req_process_kill(smx_process_t process); +XBT_PUBLIC(void) SIMIX_req_process_killall(void); /* Process handling */ XBT_PUBLIC(void) SIMIX_req_process_cleanup(smx_process_t process); XBT_PUBLIC(void) SIMIX_req_process_change_host(smx_process_t process, - const char *source, const char *dest); + smx_host_t dest); XBT_PUBLIC(void) SIMIX_req_process_suspend(smx_process_t process); XBT_PUBLIC(void) SIMIX_req_process_resume(smx_process_t process);