X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/128ea0e762c5eb7cd5c5a4be1cb7f745592be979..4a69abcc786d029bd2962537f767d12a0f808d11:/src/msg/msg_host.cpp diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index 6ae7ac51f1..7c86679d7a 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -4,15 +4,19 @@ /* 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 "simgrid/s4u/host.hpp" +#include "simgrid/s4u/storage.hpp" #include "src/msg/msg_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "simgrid/simix.h" -#include -#include +#include "src/simix/ActorImpl.hpp" +#include "src/simix/smx_host_private.h" + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); +simgrid::xbt::Extension simgrid::MsgHostExt::EXTENSION_ID; + +SG_BEGIN_DECL() + int sg_storage_max_file_descriptors = 1024; /** @addtogroup m_host_management @@ -25,17 +29,6 @@ int sg_storage_max_file_descriptors = 1024; */ /********************************* Host **************************************/ -msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our parameter -{ - msg_host_priv_t priv = xbt_new0(s_msg_host_priv_t, 1); - - priv->file_descriptor_table = nullptr; - - sg_host_msg_set(host,priv); - - return host; -} - /** \ingroup m_host_management * \brief Finds a msg_host_t using its name. * @@ -102,17 +95,6 @@ void MSG_host_off(msg_host_t host) host->turnOff(); } -/* - * \brief Frees private data of a host (internal call only) - */ -void __MSG_host_priv_free(msg_host_priv_t priv) -{ - if (priv == nullptr) - return; - delete priv->file_descriptor_table; - free(priv); -} - /** \ingroup m_host_management * \brief Return the current number MSG hosts. */ @@ -122,7 +104,7 @@ int MSG_get_host_number() } /** \ingroup m_host_management - * \brief Return a dynar containing all the hosts declared at a given point of time + * \brief Return a dynar containing all the hosts declared at a given point of time (including VMs) * \remark The host order in the returned array is generally different from the host creation/declaration order in the * XML platform (we use a hash table internally) */ @@ -160,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 @@ -198,10 +184,10 @@ xbt_dict_t MSG_host_get_properties(msg_host_t host) * \param host a host * \param name a property name * \param value what to change the property to - * \param free_ctn the freeing function to use to kill the value on need */ -void MSG_host_set_property_value(msg_host_t host, const char *name, char *value,void_f_pvoid_t free_ctn) { - xbt_dict_set(MSG_host_get_properties(host), name, value,free_ctn); +void MSG_host_set_property_value(msg_host_t host, const char* name, char* value) +{ + xbt_dict_set(MSG_host_get_properties(host), name, value, nullptr); } /** @ingroup m_host_management @@ -239,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. * @@ -277,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 @@ -299,26 +273,11 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host) xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){ storage = static_cast(xbt_lib_get_elm_or_null(storage_lib,storage_name)); - xbt_dict_t content = simcall_storage_get_content(storage); + xbt_dict_t content = MSG_storage_get_content(storage); xbt_dict_set(contents,mount_name, content,nullptr); } xbt_dict_free(&storage_list); return contents; } -int __MSG_host_get_file_descriptor_id(msg_host_t host){ - msg_host_priv_t priv = sg_host_msg(host); - if(!priv->file_descriptor_table){ - priv->file_descriptor_table = new std::vector(sg_storage_max_file_descriptors); - std::iota (priv->file_descriptor_table->rbegin(), priv->file_descriptor_table->rend(), 0); // Fill with ..., 1, 0. - } - xbt_assert(!priv->file_descriptor_table->empty(), "Too much files are opened! Some have to be closed."); - int desc = priv->file_descriptor_table->back(); - priv->file_descriptor_table->pop_back(); - return desc; -} - -void __MSG_host_release_file_descriptor_id(msg_host_t host, int id){ - msg_host_priv_t priv = sg_host_msg(host); - priv->file_descriptor_table->push_back(id); -} +SG_END_DECL()