X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/dbf95805b9f63cc091a6039e7dfa73d5d164382d..ee52f84fe512219acf534c4d4654c3df56659e91:/src/simix/smx_user.c diff --git a/src/simix/smx_user.c b/src/simix/smx_user.c index f01364295c..0c02e5e001 100644 --- a/src/simix/smx_user.c +++ b/src/simix/smx_user.c @@ -82,6 +82,31 @@ double simcall_host_get_speed(smx_host_t host) return simcall_BODY_host_get_speed(host); } +/** + * \ingroup simix_host_management + * \brief Returns the number of core of the processor. + * + * \param host A SIMIX host + * \return The number of core + */ +int simcall_host_get_core(smx_host_t host) +{ + return simcall_BODY_host_get_core(host); +} + +/** + * \ingroup simix_host_management + * \brief Returns the list of processes attached to the host. + * + * \param host A SIMIX host + * \return the swag of attached processes + */ +xbt_swag_t simcall_host_get_process_list(smx_host_t host) +{ + return simcall_BODY_host_get_process_list(host); +} + + /** * \ingroup simix_host_management * \brief Returns the available speed of the processor. @@ -131,6 +156,69 @@ void simcall_host_set_data(smx_host_t host, void *data) simcall_host_set_data(host, data); } +/** + * \ingroup simix_host_management + * \brief Returns the power peak of a host. + * + * \param host A SIMIX host + * \return the current power peak value (double) + */ +double simcall_host_get_current_power_peak(smx_host_t host) +{ + return simcall_BODY_host_get_current_power_peak(host); +} + +/** + * \ingroup simix_host_management + * \brief Returns one power peak (in flops/s) of a host at a given pstate + * + * \param host A SIMIX host + * \param pstate_index pstate to test + * \return the current power peak value (double) for pstate_index + */ +double simcall_host_get_power_peak_at(smx_host_t host, int pstate_index) +{ + return simcall_BODY_host_get_power_peak_at(host, pstate_index); +} + +/** + * \ingroup simix_host_management + * \brief Returns the number of power states for a host. + * + * \param host A SIMIX host + * \return the number of power states + */ +int simcall_host_get_nb_pstates(smx_host_t host) +{ + return simcall_BODY_host_get_nb_pstates(host); +} + +/** + * \ingroup simix_host_management + * \brief Sets a new power peak for a host. + * + * \param host A SIMIX host + * \param pstate_index The pstate to which the CPU power will be set + * \return void + */ +void simcall_host_set_power_peak_at(smx_host_t host, int pstate_index) +{ + simcall_BODY_host_set_power_peak_at(host, pstate_index); +} + +/** + * \ingroup simix_host_management + * \brief Returns the total energy consumed by the host (in Joules) + * + * \param host A SIMIX host + * \return the energy consumed by the host (double) + */ +double simcall_host_get_consumed_energy(smx_host_t host) +{ + return simcall_BODY_host_get_consumed_energy(host); +} + + /** * \ingroup simix_host_management * \brief Creates an action that executes some computation of an host. @@ -144,7 +232,6 @@ void simcall_host_set_data(smx_host_t host, void *data) * \param priority computation priority * \return A new SIMIX execution action */ - smx_action_t simcall_host_execute(const char *name, smx_host_t host, double computation_amount, double priority) @@ -735,6 +822,39 @@ smx_action_t simcall_comm_irecv(smx_rdv_t rdv, void *dst_buff, size_t *dst_buff_ } +/** + * \ingroup simix_comm_management + */ +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_assert(isfinite(timeout), "timeout is not finite!"); + xbt_assert(rdv, "No rendez-vous point defined for recv"); + + if (MC_is_active()) { + /* the model-checker wants two separate simcalls */ + smx_action_t comm = simcall_comm_irecv_bounded(rdv, dst_buff, dst_buff_size, + match_fun, data, rate); + simcall_comm_wait(comm, timeout); + } + else { + simcall_BODY_comm_recv_bounded(rdv, dst_buff, dst_buff_size, + match_fun, data, timeout, rate); + } +} +/** + * \ingroup simix_comm_management + */ +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_assert(rdv, "No rendez-vous point defined for irecv"); + + return simcall_BODY_comm_irecv_bounded(rdv, dst_buff, dst_buff_size, + match_fun, data, rate); +} + + /** * \ingroup simix_comm_management */ @@ -1056,47 +1176,62 @@ int simcall_sem_get_capacity(smx_sem_t sem) /** * \ingroup simix_file_management + * \brief Returns the user data associated to a file. * + * \param fd A simix file + * \return the user data of this file */ -double simcall_file_read(void* ptr, size_t size, size_t nmemb, smx_file_t stream) +void* simcall_file_get_data(smx_file_t fd) { - return simcall_BODY_file_read(ptr, size, nmemb, stream); + return simcall_BODY_file_get_data(fd); } /** * \ingroup simix_file_management + * \brief Sets the user data associated to a file. * + * \param fd A SIMIX file + * \param data The user data to set */ -size_t simcall_file_write(const void* ptr, size_t size, size_t nmemb, smx_file_t stream) +void simcall_file_set_data(smx_file_t fd, void *data) { - return simcall_BODY_file_write(ptr, size, nmemb, stream); + simcall_file_set_data(fd, data); } /** * \ingroup simix_file_management - * \brief + * */ -smx_file_t simcall_file_open(const char* mount, const char* path, const char* mode) +size_t simcall_file_read(size_t size, smx_file_t fd) { - return simcall_BODY_file_open(mount, path, mode); + return simcall_BODY_file_read(size, fd); } /** * \ingroup simix_file_management * */ -int simcall_file_close(smx_file_t fp) +size_t simcall_file_write(size_t size, smx_file_t fd) { - return simcall_BODY_file_close(fp); + return simcall_BODY_file_write(size, fd); +} + +/** + * \ingroup simix_file_management + * \brief + */ +smx_file_t simcall_file_open(const char* mount, const char* path) +{ + return simcall_BODY_file_open(mount, path); } /** * \ingroup simix_file_management * */ -int simcall_file_stat(smx_file_t fd, s_file_stat_t *buf) +int simcall_file_close(smx_file_t fd) { - return simcall_BODY_file_stat(fd, buf); + return simcall_BODY_file_close(fd); } /** @@ -1116,6 +1251,54 @@ xbt_dict_t simcall_file_ls(const char* mount, const char* path) { return simcall_BODY_file_ls(mount, path); } +/** + * \ingroup simix_file_management + * + */ +size_t simcall_file_get_size (smx_file_t fd){ + return simcall_BODY_file_get_size(fd); +} + +/** + * \ingroup simix_file_management + * + */ +xbt_dynar_t simcall_file_get_info(smx_file_t fd) +{ + return simcall_BODY_file_get_info(fd); +} + +/** + * \ingroup simix_storage_management + * \brief Return the free space size on a given storage element. + * \param storage name + * \return Return the free space size on a given storage element (as size_t) + */ +size_t simcall_storage_get_free_size (const char* name){ + return simcall_BODY_storage_get_free_size(name); +} + +/** + * \ingroup simix_storage_management + * \brief Return the used space size on a given storage element. + * \param storage name + * \return Return the used space size on a given storage element (as size_t) + */ +size_t simcall_storage_get_used_size (const char* name){ + return simcall_BODY_storage_get_used_size(name); +} + +/** + * \ingroup simix_storage_management + * \brief Return the list of storages mounted on an host. + * \param host A SIMIX host + * \return a dynar containing all storages mounted on the host + */ +xbt_dynar_t simcall_host_get_storage_list(smx_host_t host) +{ + return simcall_BODY_host_get_storage_list(host); +} + #ifdef HAVE_MC @@ -1128,6 +1311,12 @@ int simcall_mc_compare_snapshots(void *s1, void *s2){ return simcall_BODY_mc_compare_snapshots(s1, s2); } +int simcall_mc_random(int min, int max) +{ + return simcall_BODY_mc_random(min, max); +} + + #endif /* HAVE_MC */ /* ****************************************************************************************** */