X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/61a837a60b668d9cd79a445eb5f99fd4fd77effc..d2548eab32dea3d8939f0d71332c3e8ee2748445:/include/simgrid/simix.h diff --git a/include/simgrid/simix.h b/include/simgrid/simix.h index 5c3d41b1a0..1c095a8822 100644 --- a/include/simgrid/simix.h +++ b/include/simgrid/simix.h @@ -68,10 +68,12 @@ typedef struct s_smx_cond *smx_cond_t; typedef struct s_smx_sem *smx_sem_t; /********************************** File *************************************/ + typedef struct s_smx_file *smx_file_t; /********************************** Storage *************************************/ -typedef struct s_smx_storage *smx_storage_t; +typedef xbt_dictelm_t smx_storage_t; +typedef struct s_smx_storage_priv *smx_storage_priv_t; /********************************** Action *************************************/ typedef struct s_smx_action *smx_action_t; /* FIXME: replace by specialized action handlers */ @@ -262,6 +264,7 @@ XBT_PUBLIC(void*) SIMIX_host_self_get_data(void); XBT_PUBLIC(void*) SIMIX_host_get_data(smx_host_t host); XBT_PUBLIC(void) SIMIX_host_set_data(smx_host_t host, void *data); XBT_PUBLIC(xbt_dynar_t) SIMIX_host_get_storage_list(smx_host_t host); +XBT_PUBLIC(const char*) SIMIX_storage_get_name(smx_host_t host); /********************************* Process ************************************/ XBT_PUBLIC(int) SIMIX_process_count(void); @@ -491,6 +494,10 @@ XBT_PUBLIC(xbt_dynar_t) simcall_file_get_info(smx_file_t fd); /***************************** Storage **********************************/ XBT_PUBLIC(size_t) simcall_storage_get_free_size (const char* name); XBT_PUBLIC(size_t) simcall_storage_get_used_size (const char* name); +XBT_PUBLIC(xbt_dict_t) simcall_storage_get_properties(smx_storage_t storage); +XBT_PUBLIC(void*) SIMIX_storage_get_data(smx_storage_t storage); +XBT_PUBLIC(void) SIMIX_storage_set_data(smx_storage_t storage, void *data); +XBT_PUBLIC(xbt_dict_t) SIMIX_storage_get_content(smx_storage_t storage); /************************** AS router **********************************/ XBT_PUBLIC(xbt_dict_t) SIMIX_asr_get_properties(const char *name); @@ -500,7 +507,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); +XBT_PUBLIC(int) simcall_mc_random(int min, int max); /************************** New API simcalls **********************************/ /* TUTORIAL: New API */