X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d0e92347e2ff135459af73e2dc199a3d33f684f..0f86d40fdf09712d615dcc7c8ae54e75ff841301:/include/simix/simix.h diff --git a/include/simix/simix.h b/include/simix/simix.h index a64306cd7d..b64385e065 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); @@ -60,7 +60,6 @@ XBT_PUBLIC(void) SIMIX_host_self_set_data(void *data); XBT_PUBLIC(void*) SIMIX_host_self_get_data(void); /********************************* Process ************************************/ -XBT_PUBLIC(void) SIMIX_process_cleanup(smx_process_t arg); 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); @@ -73,6 +72,12 @@ 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(void) smpi_comm_copy_data_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 */ @@ -112,24 +117,26 @@ XBT_PUBLIC(void) SIMIX_req_host_execution_cancel(smx_action_t execution); XBT_PUBLIC(double) SIMIX_req_host_execution_get_remains(smx_action_t execution); XBT_PUBLIC(e_smx_state_t) SIMIX_req_host_execution_get_state(smx_action_t execution); XBT_PUBLIC(void) SIMIX_req_host_execution_set_priority(smx_action_t execution, double priority); -XBT_PUBLIC(void) SIMIX_req_host_execution_wait(smx_action_t execution); +XBT_PUBLIC(e_smx_state_t) SIMIX_req_host_execution_wait(smx_action_t execution); /**************************** Process Requests ********************************/ /* Constructor and Destructor */ -XBT_PUBLIC(smx_process_t) SIMIX_req_process_create(const char *name, - xbt_main_func_t code, - void *data, - const char *hostname, - int argc, char **argv, - xbt_dict_t properties); +XBT_PUBLIC(void) SIMIX_req_process_create(smx_process_t *process, + const char *name, + xbt_main_func_t code, + void *data, + const char *hostname, + int argc, char **argv, + 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(void *arg); /* FIXME: This function shouldn't be called from outside SIMIX */ +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); @@ -155,21 +162,30 @@ XBT_PUBLIC(smx_action_t) SIMIX_req_rdv_get_head(smx_rdv_t rdv); /***** Communication Requests *****/ -/* Constructors and Destructor */ +XBT_PUBLIC(void) SIMIX_req_comm_send(smx_rdv_t rdv, double task_size, + double rate, void *src_buff, + size_t src_buff_size, + int (*match_fun)(void *, void *), + void *data, double timeout); + XBT_PUBLIC(smx_action_t) SIMIX_req_comm_isend(smx_rdv_t rdv, double task_size, - double rate, void *src_buff, - size_t src_buff_size, - int (*match_fun)(void *, void *), - void *data); + double rate, void *src_buff, + size_t src_buff_size, + int (*match_fun)(void *, void *), + void *data, int detached); + +XBT_PUBLIC(void) SIMIX_req_comm_recv(smx_rdv_t rdv, void *dst_buff, + size_t * dst_buff_size, + int (*match_fun)(void *, void *), + void *data, double timeout); XBT_PUBLIC(smx_action_t) SIMIX_req_comm_irecv(smx_rdv_t rdv, void *dst_buff, - size_t * dst_buff_size, - int (*match_fun)(void *, void *), - void *data); + size_t * dst_buff_size, + int (*match_fun)(void *, void *), + void *data); XBT_PUBLIC(void) SIMIX_req_comm_destroy(smx_action_t comm); -/* Communication handling */ XBT_INLINE XBT_PUBLIC(void) SIMIX_req_comm_cancel(smx_action_t comm); /* FIXME: waitany is going to be a vararg function, and should take a timeout */ @@ -183,10 +199,6 @@ XBT_PUBLIC(double) SIMIX_req_comm_get_remains(smx_action_t comm); XBT_PUBLIC(e_smx_state_t) SIMIX_req_comm_get_state(smx_action_t comm); XBT_PUBLIC(void *) SIMIX_req_comm_get_src_data(smx_action_t comm); XBT_PUBLIC(void *) SIMIX_req_comm_get_dst_data(smx_action_t comm); -XBT_PUBLIC(void *) SIMIX_req_comm_get_src_buff(smx_action_t comm); -XBT_PUBLIC(void *) SIMIX_req_comm_get_dst_buff(smx_action_t comm); -XBT_PUBLIC(size_t) SIMIX_req_comm_get_src_buff_size(smx_action_t comm); -XBT_PUBLIC(size_t) SIMIX_req_comm_get_dst_buff_size(smx_action_t comm); XBT_PUBLIC(smx_process_t) SIMIX_req_comm_get_src_proc(smx_action_t comm); XBT_PUBLIC(smx_process_t) SIMIX_req_comm_get_dst_proc(smx_action_t comm); XBT_PUBLIC(void) SIMIX_req_comm_set_copy_data_callback(void (*callback)(smx_action_t,size_t));