X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d49424af95e13938bd75aaa5fdd36e5d3d4406f5..58b3ca13418929fcbc0529f43269373cba293cae:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 97182b75ab..dfdc52551e 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -10,7 +10,6 @@ #include "xbt/misc.h" #include "xbt/fifo.h" #include "xbt/dict.h" -#include "xbt/file_stat.h" #include "xbt/function_types.h" #include "xbt/parmap.h" #include "xbt/swag.h" @@ -34,7 +33,8 @@ typedef union u_smx_scalar u_smx_scalar_t; \see m_host_management @{ */ -typedef struct s_smx_host *smx_host_t; +typedef xbt_dictelm_t smx_host_t; +typedef struct s_smx_host_priv *smx_host_priv_t; typedef enum { SIMIX_WAITING, SIMIX_READY, @@ -69,7 +69,6 @@ typedef struct s_smx_sem *smx_sem_t; /********************************** File *************************************/ typedef struct s_smx_file *smx_file_t; -typedef struct s_smx_stat *smx_stat_t; /********************************** Action *************************************/ typedef struct s_smx_action *smx_action_t; /* FIXME: replace by specialized action handlers */ @@ -166,12 +165,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 */ /* *********************** */ @@ -246,7 +239,9 @@ XBT_PUBLIC(void) SIMIX_create_environment(const char *file); XBT_PUBLIC(void) SIMIX_function_register(const char *name, xbt_main_func_t code); XBT_PUBLIC(void) SIMIX_function_register_default(xbt_main_func_t code); XBT_PUBLIC(xbt_main_func_t) SIMIX_get_registered_function(const char *name); +XBT_PUBLIC(void) SIMIX_init_application(void); XBT_PUBLIC(void) SIMIX_launch_application(const char *file); + XBT_PUBLIC(void) SIMIX_process_set_function(const char* process_host, const char *process_function, xbt_dynar_t arguments, @@ -255,14 +250,14 @@ XBT_PUBLIC(void) SIMIX_process_set_function(const char* process_host, /*********************************** Host *************************************/ //XBT_PUBLIC(xbt_dict_t) SIMIX_host_get_dict(u_smx_scalar_t *args); -XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(u_smx_scalar_t *args); +XBT_PUBLIC(smx_host_t) SIMIX_host_get_by_name(const char *name); XBT_PUBLIC(smx_host_t) SIMIX_host_self(void); XBT_PUBLIC(const char*) SIMIX_host_self_get_name(void); -XBT_PUBLIC(const char*) SIMIX_host_get_name(u_smx_scalar_t *args); /* FIXME: make private: only the name of SIMIX_host_self() should be public without request */ +XBT_PUBLIC(const char*) SIMIX_host_get_name(smx_host_t host); /* FIXME: make private: only the name of SIMIX_host_self() should be public without request */ XBT_PUBLIC(void) SIMIX_host_self_set_data(void *data); XBT_PUBLIC(void*) SIMIX_host_self_get_data(void); -XBT_PUBLIC(void*) SIMIX_host_get_data(u_smx_scalar_t *args); -XBT_PUBLIC(void) SIMIX_host_set_data(u_smx_scalar_t *args); +XBT_PUBLIC(void*) SIMIX_host_get_data(smx_host_t host); +XBT_PUBLIC(void) SIMIX_host_set_data(smx_host_t host, void *data); /********************************* Process ************************************/ XBT_PUBLIC(int) SIMIX_process_count(void); @@ -280,7 +275,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); @@ -296,7 +290,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); @@ -339,7 +332,7 @@ XBT_PUBLIC(void) simcall_process_create(smx_process_t *process, int auto_restart); XBT_PUBLIC(void) simcall_process_kill(smx_process_t process); -XBT_PUBLIC(void) simcall_process_killall(void); +XBT_PUBLIC(void) simcall_process_killall(int reset_pid); /* Process handling */ XBT_PUBLIC(void) simcall_process_cleanup(smx_process_t process); @@ -354,6 +347,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); @@ -401,6 +396,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); @@ -449,20 +454,16 @@ 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); XBT_PUBLIC(size_t) simcall_file_write(const void* ptr, size_t size, size_t nmemb, smx_file_t stream); XBT_PUBLIC(smx_file_t) simcall_file_open(const char* storage, const char* path, const char* mode); XBT_PUBLIC(int) simcall_file_close(smx_file_t fp); -XBT_PUBLIC(int) simcall_file_stat(smx_file_t fd, s_file_stat_t *buf); XBT_PUBLIC(int) simcall_file_unlink(smx_file_t fd); XBT_PUBLIC(xbt_dict_t) simcall_file_ls(const char* mount, const char* path); @@ -474,6 +475,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 */