X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/50112236f62426d55750da4901ab88456a272e7f..172a73b13fe909117c7fbf3d69d4ce5e87efdbc6:/src/msg/msg_host.cpp diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index 51972e0526..7605967a69 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -1,27 +1,25 @@ -/* 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 "simgrid/s4u/host.hpp" -#include "simgrid/s4u/storage.hpp" -#include "src/msg/msg_private.h" +#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.h" - +#include "src/simix/smx_host_private.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); simgrid::xbt::Extension simgrid::MsgHostExt::EXTENSION_ID; -SG_BEGIN_DECL() +extern "C" { int sg_storage_max_file_descriptors = 1024; /** @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. @@ -75,7 +73,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) @@ -87,7 +85,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) @@ -104,7 +102,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) */ @@ -116,16 +114,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 @@ -135,7 +124,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->coreCount(); + return host->getCoreCount(); } /** \ingroup m_host_management @@ -163,7 +152,7 @@ void MSG_host_get_process_list(msg_host_t host, xbt_dynar_t whereto) */ 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 @@ -175,7 +164,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 @@ -187,13 +183,14 @@ xbt_dict_t MSG_host_get_properties(msg_host_t host) */ 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); + 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 @@ -206,7 +203,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) { @@ -214,7 +212,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 @@ -226,7 +224,7 @@ double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) { } /** \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 */ @@ -241,8 +239,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 @@ -264,20 +261,9 @@ 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(); + for (auto const& elm : host->getMountedStorages()) + xbt_dict_set(contents, elm.first.c_str(), MSG_storage_get_content(elm.second), nullptr); - 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; } - -SG_END_DECL() +}