X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4dbb8aa24d54e0a4091b1f01017032702d0376f7..ea8f841a468a3db03f1d74e8e92e2dfba3db6f3b:/src/simix/libsmx.c diff --git a/src/simix/libsmx.c b/src/simix/libsmx.c index 25285dc873..ab101d1db2 100644 --- a/src/simix/libsmx.c +++ b/src/simix/libsmx.c @@ -11,9 +11,9 @@ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "mc/mc_replay.h" +#include "src/mc/mc_replay.h" #include "smx_private.h" -#include "mc/mc_forward.h" +#include "src/mc/mc_forward.h" #include "xbt/ex.h" #include /* isfinite() */ #include "mc/mc.h" @@ -22,18 +22,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); #include "popping_bodies.c" -/** - * \ingroup simix_host_management - * \brief Returns the name of a host. - * - * \param host A SIMIX host - * \return The name of this host - */ -const char* simcall_host_get_name(sg_host_t host) -{ - return simcall_BODY_host_get_name(host); -} - /** * \ingroup simix_host_management * \brief Start the host if it is off @@ -80,32 +68,6 @@ xbt_dict_t simcall_asr_get_properties(const char *name) return simcall_BODY_asr_get_properties(name); } - -/** - * \ingroup simix_host_management - * \brief Returns the speed of the processor. - * - * The speed returned does not take into account the current load on the machine. - * \param host A SIMIX host - * \return The speed of this host (in Mflop/s) - */ -double simcall_host_get_speed(sg_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(sg_host_t host) -{ - return simcall_BODY_host_get_core(host); -} - /** * \ingroup simix_host_management * \brief Returns the list of processes attached to the host. @@ -118,31 +80,6 @@ xbt_swag_t simcall_host_get_process_list(sg_host_t host) return simcall_BODY_host_get_process_list(host); } - -/** - * \ingroup simix_host_management - * \brief Returns the available speed of the processor. - * - * \return Speed currently available (in Mflop/s) - */ -double simcall_host_get_available_speed(sg_host_t host) -{ - return simcall_BODY_host_get_available_speed(host); -} - -/** - * \ingroup simix_host_management - * \brief Returns the state of a host. - * - * Two states are possible: 1 if the host is active or 0 if it has crashed. - * \param host A SIMIX host - * \return 1 if the host is available, 0 otherwise - */ -int simcall_host_get_state(sg_host_t host) -{ - return simcall_BODY_host_get_state(host); -} - /** * \ingroup simix_host_management * \brief Returns the power peak of a host. @@ -168,18 +105,6 @@ double simcall_host_get_power_peak_at(sg_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(sg_host_t host) -{ - return simcall_BODY_host_get_nb_pstates(host); -} - /** * \ingroup simix_host_management * \brief Sets the pstate at which the host should run @@ -191,28 +116,7 @@ void simcall_host_set_pstate(sg_host_t host, int pstate_index) { simcall_BODY_host_set_pstate(host, pstate_index); } -/** - * \ingroup simix_host_management - * \brief Gets the pstate at which that host currently runs. - * - * \param host A SIMIX host - */ -int simcall_host_get_pstate(sg_host_t host) -{ - return simcall_BODY_host_get_pstate(host); -} -/** - * \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(sg_host_t host) -{ - return simcall_BODY_host_get_consumed_energy(host); -} /** \ingroup simix_host_management * \brief Returns the amount of watt dissipated at the given pstate when the host is idling */