X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45d00a93682182156762f2ca97b1f2746746c8b1..3fc3df9c2436f1d43646969194d96f73ea3d4915:/src/msg/msg_host.cpp diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index c5e8a474e1..ade4a6371c 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -4,16 +4,16 @@ /* 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 "src/msg/msg_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "simgrid/simix.h" -#include XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); +simgrid::xbt::Extension simgrid::MsgHostExt::EXTENSION_ID; + +int sg_storage_max_file_descriptors = 1024; + /** @addtogroup m_host_management - * \htmlonly \endhtmlonly * (#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 @@ -23,26 +23,6 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); */ /********************************* 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->dp_objs = xbt_dict_new(); - priv->dp_enabled = 0; - priv->dp_updated_by_deleted_tasks = 0; - priv->is_migrating = 0; - - priv->affinity_mask_db = xbt_dict_new_homogeneous(NULL); - - priv->file_descriptor_table = xbt_dynar_new(sizeof(int), NULL); - for (int i=1023; i>=0;i--) - xbt_dynar_push_as(priv->file_descriptor_table, int, i); - - sg_host_msg_set(host,priv); - - return host; -} - /** \ingroup m_host_management * \brief Finds a msg_host_t using its name. * @@ -80,9 +60,9 @@ void *MSG_host_get_data(msg_host_t host) { * * \brief Return the location on which the current process is executed. */ -msg_host_t MSG_host_self(void) +msg_host_t MSG_host_self() { - return MSG_process_get_host(NULL); + return MSG_process_get_host(nullptr); } /** \ingroup m_host_management @@ -109,29 +89,12 @@ 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 == NULL) - return; - unsigned int size = xbt_dict_size(priv->dp_objs); - if (size > 0) - XBT_WARN("dp_objs: %u pending task?", size); - xbt_dict_free(&priv->dp_objs); - xbt_dict_free(&priv->affinity_mask_db); - xbt_dynar_free(&priv->file_descriptor_table); - - free(priv); -} - /** \ingroup m_host_management * \brief Return the current number MSG hosts. */ -int MSG_get_host_number(void) +int MSG_get_host_number() { - return xbt_dict_length(host_list); + return sg_host_count(); } /** \ingroup m_host_management @@ -139,7 +102,7 @@ int MSG_get_host_number(void) * \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(void) { +xbt_dynar_t MSG_hosts_as_dynar() { return sg_hosts_as_dynar(); } @@ -159,7 +122,6 @@ double MSG_get_host_speed(msg_host_t host) { return MSG_host_get_speed(host); } - /** \ingroup m_host_management * \brief Return the number of cores. * @@ -167,7 +129,7 @@ double MSG_get_host_speed(msg_host_t host) { * \return the number of cores */ int MSG_host_get_core_number(msg_host_t host) { - return host->core_count(); + return host->coreCount(); } /** \ingroup m_host_management @@ -178,7 +140,7 @@ int MSG_host_get_core_number(msg_host_t host) { */ xbt_swag_t MSG_host_get_process_list(msg_host_t host) { - xbt_assert((host != NULL), "Invalid parameters"); + xbt_assert((host != nullptr), "Invalid parameters"); return host->processes(); } @@ -187,11 +149,11 @@ xbt_swag_t MSG_host_get_process_list(msg_host_t host) * * \param host a host * \param name a property name - * \return value of a property (or NULL if property not set) + * \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 (const char*) xbt_dict_get_or_null(MSG_host_get_properties(host), name); + return static_cast(xbt_dict_get_or_null(MSG_host_get_properties(host), name)); } /** \ingroup m_host_management @@ -202,7 +164,7 @@ const char *MSG_host_get_property_value(msg_host_t host, const char *name) */ xbt_dict_t MSG_host_get_properties(msg_host_t host) { - xbt_assert((host != NULL), "Invalid parameters (host is NULL)"); + xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)"); return host->properties(); } @@ -212,10 +174,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 @@ -228,8 +190,7 @@ void MSG_host_set_property_value(msg_host_t host, const char *name, char *value, */ int MSG_host_is_on(msg_host_t host) { - xbt_assert((host != NULL), "Invalid parameters (host is NULL)"); - return sg_host_is_on(host); + return host->isOn(); } /** @ingroup m_host_management @@ -239,30 +200,7 @@ int MSG_host_is_on(msg_host_t host) */ int MSG_host_is_off(msg_host_t host) { - xbt_assert((host != NULL), "Invalid parameters (host is NULL)"); - return !(sg_host_is_on(host)); -} - -/** \ingroup m_host_management - * \brief Set the parameters of a given host - * - * \param host a host - * \param params a prameter object - */ -void MSG_host_set_params(msg_host_t host, vm_params_t params) -{ - host->setParameters(params); -} - -/** \ingroup m_host_management - * \brief Get the parameters of a given host - * - * \param host a host - * \param params a prameter object - */ -void MSG_host_get_params(msg_host_t host, vm_params_t params) -{ - host->parameters(params); + return host->isOff(); } /** \ingroup m_host_management @@ -273,8 +211,8 @@ void MSG_host_get_params(msg_host_t host, vm_params_t params) * \return Returns the processor speed associated with pstate_index */ double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) { - xbt_assert((host != NULL), "Invalid parameters (host is NULL)"); - return host->powerPeakAt(pstate_index); + xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)"); + return host->getPstateSpeed(pstate_index); } /** \ingroup m_host_management @@ -284,8 +222,8 @@ double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) { * \return Returns the current processor speed */ double MSG_host_get_current_power_peak(msg_host_t host) { - xbt_assert((host != NULL), "Invalid parameters (host is NULL)"); - return host->currentPowerPeak(); + xbt_assert((host != nullptr), "Invalid parameters (host is nullptr)"); + return host->getPstateSpeedCurrent(); } /** \ingroup m_host_management @@ -304,7 +242,7 @@ int MSG_host_get_nb_pstates(msg_host_t host) { */ xbt_dict_t MSG_host_get_mounted_storage_list(msg_host_t host) { - xbt_assert((host != NULL), "Invalid parameters"); + xbt_assert((host != nullptr), "Invalid parameters"); return host->mountedStoragesAsDict(); } @@ -315,7 +253,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 != NULL), "Invalid parameters"); + xbt_assert((host != nullptr), "Invalid parameters"); return host->attachedStorages(); } @@ -326,31 +264,20 @@ xbt_dynar_t MSG_host_get_attached_storage_list(msg_host_t host) */ xbt_dict_t MSG_host_get_storage_content(msg_host_t host) { - xbt_assert((host != NULL), "Invalid parameters"); - xbt_dict_t contents = xbt_dict_new_homogeneous(NULL); + 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 = NULL; + xbt_dict_cursor_t cursor = nullptr; xbt_dict_t storage_list = host->mountedStoragesAsDict(); xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){ - storage = (msg_storage_t)xbt_lib_get_elm_or_null(storage_lib,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_set(contents,mount_name, content,NULL); + 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); - xbt_assert(!xbt_dynar_is_empty(priv->file_descriptor_table), "Too much files are opened! Some have to be closed."); - return xbt_dynar_pop_as(priv->file_descriptor_table, int); -} - -void __MSG_host_release_file_descriptor_id(msg_host_t host, int id){ - msg_host_priv_t priv = sg_host_msg(host); - xbt_dynar_push_as(priv->file_descriptor_table, int, id); -}