X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fd7651841882fc2795ff07da448a240dbdc90220..87abed69d2734abfc0474c30b6f6d04b25a2c8ac:/src/msg/msg_host.cpp diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index edab20df1a..784265ce1a 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -5,22 +5,17 @@ #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/msg/msg_private.h" +#include "src/msg/msg_private.hpp" #include "src/simix/ActorImpl.hpp" -#include "src/simix/smx_host_private.h" - +#include "src/simix/smx_host_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); -simgrid::xbt::Extension simgrid::MsgHostExt::EXTENSION_ID; - -SG_BEGIN_DECL() - -int sg_storage_max_file_descriptors = 1024; +extern "C" { /** @addtogroup m_host_management * (#msg_host_t) and the functions for managing it. - * + * * A location (or host) is any possible place where a process may run. Thus it may be represented * as a physical resource with computing capabilities, some mailboxes to enable running process to * communicate with remote ones, and some private data that can be only accessed by local process. @@ -28,114 +23,6 @@ int sg_storage_max_file_descriptors = 1024; */ /********************************* Host **************************************/ -/** \ingroup m_host_management - * \brief Finds a msg_host_t using its name. - * - * This is a name directory service - * \param name the name of an host. - * \return the corresponding host - */ -msg_host_t MSG_host_by_name(const char *name) -{ - return simgrid::s4u::Host::by_name_or_null(name); -} - -/** \ingroup m_host_management - * - * \brief Set the user data of a #msg_host_t. - * - * This functions attach \a data to \a host if it is possible. - */ -msg_error_t MSG_host_set_data(msg_host_t host, void *data) { - sg_host_user_set(host, data); - return MSG_OK; -} - -/** \ingroup m_host_management - * - * \brief Return the user data of a #msg_host_t. - * - * This functions returns the user data associated to \a host if it is possible. - */ -void *MSG_host_get_data(msg_host_t host) { - return sg_host_user(host); -} - -/** \ingroup m_host_management - * - * \brief Return the location on which the current process is executed. - */ -msg_host_t MSG_host_self() -{ - return MSG_process_get_host(nullptr); -} - -/** \ingroup m_host_management - * - * \brief Start the host if it is off - * - * See also #MSG_host_is_on() and #MSG_host_is_off() to test the current state of the host and @ref SURF_plugin_energy - * for more info on DVFS. - */ -void MSG_host_on(msg_host_t host) -{ - host->turnOn(); -} - -/** \ingroup m_host_management - * - * \brief Stop the host if it is on - * - * See also #MSG_host_is_on() and #MSG_host_is_off() to test the current state of the host and @ref SURF_plugin_energy - * for more info on DVFS. - */ -void MSG_host_off(msg_host_t host) -{ - host->turnOff(); -} - -/** \ingroup m_host_management - * \brief Return the current number MSG hosts. - */ -int MSG_get_host_number() -{ - return sg_host_count(); -} - -/** \ingroup m_host_management - * \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) - */ -xbt_dynar_t MSG_hosts_as_dynar() { - return sg_hosts_as_dynar(); -} - -/** \ingroup m_host_management - * \brief Return the speed of the processor (in flop/s), regardless of the current load on the machine. - */ -double MSG_host_get_speed(msg_host_t host) { - return host->speed(); -} - -/** \ingroup m_host_management - * \brief Return the speed of the processor (in flop/s), regardless of the current load on the machine. - * Deprecated: use MSG_host_get_speed - */ -double MSG_get_host_speed(msg_host_t host) { - XBT_WARN("MSG_get_host_speed is deprecated: use MSG_host_get_speed"); - return MSG_host_get_speed(host); -} - -/** \ingroup m_host_management - * \brief Return the number of cores. - * - * \param host a host - * \return the number of cores - */ -int MSG_host_get_core_number(msg_host_t host) { - return host->coreCount(); -} /** \ingroup m_host_management * \brief Return the list of processes attached to an host. @@ -146,74 +33,14 @@ int MSG_host_get_core_number(msg_host_t host) { void MSG_host_get_process_list(msg_host_t host, xbt_dynar_t whereto) { xbt_assert((host != nullptr), "Invalid parameters"); - smx_actor_t actor = NULL; - xbt_swag_foreach(actor, host->extension()->process_list) { - msg_process_t p = actor->ciface(); + for (auto& actor : host->extension()->process_list) { + msg_process_t p = actor.ciface(); xbt_dynar_push(whereto, &p); } } /** \ingroup m_host_management - * \brief Returns the value of a given host property - * - * \param host a host - * \param name a property name - * \return value of a property (or nullptr if property not set) - */ -const char *MSG_host_get_property_value(msg_host_t host, const char *name) -{ - return static_cast(xbt_dict_get_or_null(MSG_host_get_properties(host), name)); -} - -/** \ingroup m_host_management - * \brief Returns a xbt_dict_t consisting of the list of properties assigned to this host - * - * \param host a host - * \return a dict containing the properties - */ -xbt_dict_t MSG_host_get_properties(msg_host_t host) -{ - xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)"); - return host->properties(); -} - -/** \ingroup m_host_management - * \brief Change the value of a given host property - * - * \param host a host - * \param name a property name - * \param value what to change the property to - */ -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 - * @brief Determine if a host is up and running. - * - * See also #MSG_host_on() and #MSG_host_off() to switch the host ON and OFF and @ref SURF_plugin_energy for more info on DVFS. - * - * @param host host to test - * @return Returns true if the host is up and running, and false if it's currently down - */ -int MSG_host_is_on(msg_host_t host) -{ - return host->isOn(); -} - -/** @ingroup m_host_management - * @brief Determine if a host is currently off. - * - * See also #MSG_host_on() and #MSG_host_off() to switch the host ON and OFF and @ref SURF_plugin_energy for more info on DVFS. - */ -int MSG_host_is_off(msg_host_t host) -{ - return host->isOff(); -} - -/** \ingroup m_host_management - * \brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref SURF_plugin_energy. + * \brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref plugin_energy. * * \param host host to test * \param pstate_index pstate to test @@ -224,59 +51,4 @@ 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 total count of pstates defined for a host. See also @ref SURF_plugin_energy. - * - * \param host host to test - */ -int MSG_host_get_nb_pstates(msg_host_t host) { - return sg_host_get_nb_pstates(host); -} - -/** \ingroup m_host_management - * \brief Return the list of mount point names on an host. - * \param host a host - * \return a dict containing all mount point on the host (mount_name => msg_storage_t) - */ -xbt_dict_t MSG_host_get_mounted_storage_list(msg_host_t host) -{ - xbt_assert((host != nullptr), "Invalid parameters"); - return host->mountedStoragesAsDict(); } - -/** \ingroup m_host_management - * \brief Return the list of storages attached to an host. - * \param host a host - * \return a dynar containing all storages (name) attached to the host - */ -xbt_dynar_t MSG_host_get_attached_storage_list(msg_host_t host) -{ - return sg_host_get_attached_storage_list(host); -} - -/** \ingroup m_host_management - * \brief Return the content of mounted storages on an host. - * \param host a host - * \return a dict containing content (as a dict) of all storages mounted on the host - */ -xbt_dict_t MSG_host_get_storage_content(msg_host_t host) -{ - xbt_assert((host != nullptr), "Invalid parameters"); - xbt_dict_t contents = xbt_dict_new_homogeneous(nullptr); - msg_storage_t storage; - char* storage_name; - char* mount_name; - xbt_dict_cursor_t cursor = nullptr; - - xbt_dict_t storage_list = host->mountedStoragesAsDict(); - - xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){ - storage = simgrid::s4u::Storage::byName(storage_name); - xbt_dict_t content = MSG_storage_get_content(storage); - xbt_dict_set(contents,mount_name, content,nullptr); - } - xbt_dict_free(&storage_list); - return contents; -} - -SG_END_DECL()