X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3cb7565abeaa2a0e48daac342e7e2291c5a98138..3fc3df9c2436f1d43646969194d96f73ea3d4915:/src/msg/msg_host.cpp diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index e50f818115..ade4a6371c 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -4,14 +4,15 @@ /* 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 * (#msg_host_t) and the functions for managing it. * @@ -22,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(nullptr); - - priv->file_descriptor_table = xbt_dynar_new(sizeof(int), nullptr); - 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. * @@ -79,7 +60,7 @@ 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(nullptr); } @@ -108,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 == nullptr) - 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 @@ -138,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(); } @@ -158,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. * @@ -166,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->coresCount(); + return host->coreCount(); } /** \ingroup m_host_management @@ -190,7 +153,7 @@ xbt_swag_t MSG_host_get_process_list(msg_host_t host) */ 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 @@ -211,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 @@ -240,28 +203,6 @@ int MSG_host_is_off(msg_host_t host) return host->isOff(); } -/** \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); -} - /** \ingroup m_host_management * \brief Return the speed of the processor (in flop/s) at a given pstate. See also @ref SURF_plugin_energy. * @@ -333,21 +274,10 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host) 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,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); -}