X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/096bd885787fc858262059ac8ad284ca3aa47397..04d3d36e9e87d194bee4f88859f96d66975cce31:/src/msg/msg_host.cpp diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index 28bd9bbf3b..5db2de1d5c 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -1,23 +1,21 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2017. The SimGrid Team. All rights reserved. */ /* 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 "src/msg/msg_private.h" -#include "xbt/sysdep.h" -#include "xbt/log.h" -#include "simgrid/simix.h" -#include -#include +#include "simgrid/s4u/Host.hpp" +#include "simgrid/s4u/Storage.hpp" +#include "src/msg/msg_private.hpp" +#include "src/simix/ActorImpl.hpp" +#include "src/simix/smx_host_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); -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. @@ -25,22 +23,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->dp_objs = nullptr; - priv->dp_enabled = 0; - priv->dp_updated_by_deleted_tasks = 0; - priv->is_migrating = 0; - - 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. * @@ -87,7 +69,7 @@ msg_host_t MSG_host_self() * * \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 + * See also #MSG_host_is_on() and #MSG_host_is_off() to test the current state of the host and @ref plugin_energy * for more info on DVFS. */ void MSG_host_on(msg_host_t host) @@ -99,7 +81,7 @@ void MSG_host_on(msg_host_t host) * * \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 + * See also #MSG_host_is_on() and #MSG_host_is_off() to test the current state of the host and @ref plugin_energy * for more info on DVFS. */ void MSG_host_off(msg_host_t host) @@ -107,21 +89,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; - unsigned int size = priv->dp_objs ? xbt_dict_size(priv->dp_objs) : 0; - if (size > 0) - XBT_WARN("dp_objs: %u pending task?", size); - xbt_dict_free(&priv->dp_objs); - delete priv->file_descriptor_table; - free(priv); -} - /** \ingroup m_host_management * \brief Return the current number MSG hosts. */ @@ -131,7 +98,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) */ @@ -143,16 +110,7 @@ xbt_dynar_t MSG_hosts_as_dynar() { * \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); + return host->getSpeed(); } /** \ingroup m_host_management @@ -162,19 +120,23 @@ 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->coreCount(); + return host->getCoreCount(); } /** \ingroup m_host_management * \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 @@ -186,7 +148,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 static_cast(xbt_dict_get_or_null(MSG_host_get_properties(host), name)); + return host->getProperty(name); } /** \ingroup m_host_management @@ -198,7 +160,14 @@ 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 != nullptr), "Invalid parameters (host is nullptr)"); - return host->properties(); + xbt_dict_t as_dict = xbt_dict_new_homogeneous(xbt_free_f); + std::map* props = host->getProperties(); + if (props == nullptr) + return nullptr; + for (auto const& elm : *props) { + xbt_dict_set(as_dict, elm.first.c_str(), xbt_strdup(elm.second.c_str()), nullptr); + } + return as_dict; } /** \ingroup m_host_management @@ -207,16 +176,17 @@ 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) +{ + host->setProperty(name, value); } /** @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. + * See also #MSG_host_on() and #MSG_host_off() to switch the host ON and OFF and @ref 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 @@ -229,7 +199,8 @@ int MSG_host_is_on(msg_host_t host) /** @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. + * See also #MSG_host_on() and #MSG_host_off() to switch the host ON and OFF and @ref plugin_energy for more info on + * DVFS. */ int MSG_host_is_off(msg_host_t host) { @@ -237,7 +208,7 @@ int MSG_host_is_off(msg_host_t host) } /** \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 @@ -249,18 +220,7 @@ double MSG_host_get_power_peak_at(msg_host_t host, int 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. + * \brief Return the total count of pstates defined for a host. See also @ref plugin_energy. * * \param host host to test */ @@ -275,8 +235,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 != nullptr), "Invalid parameters"); - return host->mountedStoragesAsDict(); + return sg_host_get_mounted_storage_list(host); } /** \ingroup m_host_management @@ -286,48 +245,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(); -} - -/** \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 = 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); - 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; + return sg_host_get_attached_storage_list(host); } -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); }