X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fbbc5d9c3b45d6be495f0b7f85ce84547c173567..c1c1e55a043d3cb03aa731754b30c18b3151da91:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index c53fd4e43e..36bce8d4b5 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -15,6 +15,8 @@ #include "xbt/parmap.h" #include "xbt/swag.h" +#include "simgrid/platf.h" // ws_params_t + SG_BEGIN_DECL() /**************************** Scalar Values **********************************/ @@ -167,12 +169,6 @@ extern char* smx_context_factory_name; extern int smx_context_stack_size; extern int smx_context_stack_size_was_set; -#ifdef HAVE_THREAD_LOCAL_STORAGE -extern __thread smx_context_t smx_current_context; -#else -extern smx_context_t smx_current_context; -#endif - /* *********************** */ /* Context type definition */ /* *********************** */ @@ -283,7 +279,6 @@ XBT_PUBLIC(void) SIMIX_process_on_exit(smx_process_t process, int_f_pvoid_t fun, XBT_PUBLIC(void) SIMIX_comm_set_copy_data_callback(void (*callback) (smx_action_t, void*, size_t)); XBT_PUBLIC(void) SIMIX_comm_copy_pointer_callback(smx_action_t comm, void* buff, size_t buff_size); XBT_PUBLIC(void) SIMIX_comm_copy_buffer_callback(smx_action_t comm, void* buff, size_t buff_size); -XBT_PUBLIC(void) smpi_comm_copy_data_callback(smx_action_t comm, void* buff, 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); @@ -299,7 +294,6 @@ XBT_PUBLIC(void) SIMIX_comm_finish(smx_action_t action); /******************************* Host simcalls ********************************/ /* TODO use handlers and keep smx_host_t hidden from higher levels */ -XBT_PUBLIC(xbt_dict_t) simcall_host_get_dict(void); XBT_PUBLIC(smx_host_t) simcall_host_get_by_name(const char *name); XBT_PUBLIC(const char *) simcall_host_get_name(smx_host_t host); XBT_PUBLIC(xbt_dict_t) simcall_host_get_properties(smx_host_t host); @@ -327,7 +321,22 @@ XBT_PUBLIC(double) simcall_host_execution_get_remains(smx_action_t execution); XBT_PUBLIC(e_smx_state_t) simcall_host_execution_get_state(smx_action_t execution); XBT_PUBLIC(void) simcall_host_execution_set_priority(smx_action_t execution, double priority); XBT_PUBLIC(e_smx_state_t) simcall_host_execution_wait(smx_action_t execution); - +XBT_PUBLIC(void) simcall_host_get_params(smx_host_t vm, ws_params_t param); +XBT_PUBLIC(void) simcall_host_set_params(smx_host_t vm, ws_params_t param); + +/******************************* VM simcalls ********************************/ +// Create the vm_workstation at the SURF level +XBT_PUBLIC(void*) simcall_vm_create(const char *name, smx_host_t host); +XBT_PUBLIC(int) simcall_vm_get_state(smx_host_t vm); +XBT_PUBLIC(void) simcall_vm_start(smx_host_t vm); +XBT_PUBLIC(void) simcall_vm_migrate(smx_host_t vm, smx_host_t dst_pm); +XBT_PUBLIC(void *) simcall_vm_get_pm(smx_host_t vm); +XBT_PUBLIC(void) simcall_vm_resume(smx_host_t vm); +XBT_PUBLIC(void) simcall_vm_save(smx_host_t vm); +XBT_PUBLIC(void) simcall_vm_restore(smx_host_t vm); +XBT_PUBLIC(void) simcall_vm_suspend(smx_host_t vm); +XBT_PUBLIC(void) simcall_vm_destroy(smx_host_t vm); +XBT_PUBLIC(void) simcall_vm_shutdown(smx_host_t vm); /**************************** Process simcalls ********************************/ /* Constructor and Destructor */ @@ -357,6 +366,8 @@ XBT_PUBLIC(void *) simcall_process_get_data(smx_process_t process); XBT_PUBLIC(void) simcall_process_set_data(smx_process_t process, void *data); XBT_PUBLIC(smx_host_t) simcall_process_get_host(smx_process_t process); XBT_PUBLIC(const char *) simcall_process_get_name(smx_process_t process); +XBT_PUBLIC(int) simcall_process_get_PID(smx_process_t process); +XBT_PUBLIC(int) simcall_process_get_PPID(smx_process_t process); XBT_PUBLIC(int) simcall_process_is_suspended(smx_process_t process); XBT_PUBLIC(xbt_dict_t) simcall_process_get_properties(smx_process_t host); XBT_PUBLIC(void) simcall_process_set_kill_time(smx_process_t process, double kill_time); @@ -404,6 +415,16 @@ XBT_PUBLIC(smx_action_t) simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, int (*match_fun)(void *, void *, smx_action_t), void *data); +XBT_PUBLIC(void) simcall_comm_recv_bounded(smx_rdv_t rdv, void *dst_buff, + size_t * dst_buff_size, + int (*match_fun)(void *, void *, smx_action_t), + void *data, double timeout, double rate); + +XBT_PUBLIC(smx_action_t) simcall_comm_irecv_bounded(smx_rdv_t rdv, void *dst_buff, + size_t * dst_buff_size, + int (*match_fun)(void *, void *, smx_action_t), + void *data, double rate); + XBT_PUBLIC(void) simcall_comm_destroy(smx_action_t comm); XBT_PUBLIC(smx_action_t) simcall_comm_iprobe(smx_rdv_t rdv, int src, int tag, int (*match_fun)(void *, void *, smx_action_t), void *data); @@ -452,13 +473,10 @@ XBT_PUBLIC(void) simcall_cond_broadcast(smx_cond_t cond); XBT_PUBLIC(smx_sem_t) simcall_sem_init(int capacity); XBT_PUBLIC(void) simcall_sem_destroy(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_release(smx_sem_t sem); -XBT_PUBLIC(void) simcall_sem_release_forever(smx_sem_t sem); XBT_PUBLIC(int) simcall_sem_would_block(smx_sem_t sem); -XBT_PUBLIC(void) simcall_sem_block_onto(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_acquire(smx_sem_t sem); XBT_PUBLIC(void) simcall_sem_acquire_timeout(smx_sem_t sem, double max_duration); -XBT_PUBLIC(unsigned int) simcall_sem_acquire_any(xbt_dynar_t sems); XBT_PUBLIC(int) simcall_sem_get_capacity(smx_sem_t sem); XBT_PUBLIC(double) simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t stream); @@ -477,6 +495,7 @@ XBT_PUBLIC(xbt_dict_t) simcall_asr_get_properties(const char *name); /************************** MC simcalls **********************************/ XBT_PUBLIC(void *) simcall_mc_snapshot(void); XBT_PUBLIC(int) simcall_mc_compare_snapshots(void *s1, void *s2); +XBT_PUBLIC(int) simcall_mc_random(void); /************************** New API simcalls **********************************/ /* TUTORIAL: New API */