X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d442cebf6863fc131f3fcf453039a70e6b014d11..fb81c8bcd9bf351c3a575908adfa783b0b375e10:/src/msg/msg_host.cpp diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index e8f65182b5..51972e0526 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -5,7 +5,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "simgrid/s4u/host.hpp" +#include "simgrid/s4u/storage.hpp" #include "src/msg/msg_private.h" +#include "src/simix/ActorImpl.hpp" +#include "src/simix/smx_host_private.h" + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); @@ -138,12 +142,16 @@ int MSG_host_get_core_number(msg_host_t host) { * \brief Return the list of processes attached to an host. * * \param host a host - * \return a swag with the attached processes + * \param whereto a dynar in which we should push processes living on that host */ -xbt_swag_t MSG_host_get_process_list(msg_host_t host) +void MSG_host_get_process_list(msg_host_t host, xbt_dynar_t whereto) { xbt_assert((host != nullptr), "Invalid parameters"); - return host->processes(); + smx_actor_t actor = NULL; + xbt_swag_foreach(actor, host->extension()->process_list) { + msg_process_t p = actor->ciface(); + xbt_dynar_push(whereto, &p); + } } /** \ingroup m_host_management @@ -217,17 +225,6 @@ double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) { return host->getPstateSpeed(pstate_index); } -/** \ingroup m_host_management - * \brief Return the current speed of the processor (in flop/s) - * - * \param host host to test - * \return Returns the current processor speed - */ -double MSG_host_get_current_power_peak(msg_host_t host) { - xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)"); - return host->getPstateSpeedCurrent(); -} - /** \ingroup m_host_management * \brief Return the total count of pstates defined for a host. See also @ref SURF_plugin_energy. * @@ -255,8 +252,7 @@ xbt_dict_t MSG_host_get_mounted_storage_list(msg_host_t host) */ xbt_dynar_t MSG_host_get_attached_storage_list(msg_host_t host) { - xbt_assert((host != nullptr), "Invalid parameters"); - return host->attachedStorages(); + return sg_host_get_attached_storage_list(host); } /** \ingroup m_host_management