X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3fc3df9c2436f1d43646969194d96f73ea3d4915..b6be4a786958974306e8f7b18eae6f1f77ebd4ee:/src/msg/msg_host.cpp diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp index ade4a6371c..407e5a283e 100644 --- a/src/msg/msg_host.cpp +++ b/src/msg/msg_host.cpp @@ -1,21 +1,26 @@ -/* 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/Host.hpp" +#include "simgrid/s4u/Storage.hpp" #include "src/msg/msg_private.h" +#include "src/simix/ActorImpl.hpp" +#include "src/simix/smx_host_private.h" + XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg); simgrid::xbt::Extension simgrid::MsgHostExt::EXTENSION_ID; +SG_BEGIN_DECL() + 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. @@ -69,7 +74,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) @@ -81,7 +86,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) @@ -98,7 +103,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) */ @@ -136,12 +141,16 @@ int MSG_host_get_core_number(msg_host_t host) { * \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 @@ -183,7 +192,8 @@ void MSG_host_set_property_value(msg_host_t host, const char* name, char* 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 @@ -196,7 +206,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) { @@ -204,7 +215,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 @@ -216,18 +227,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 */ @@ -242,8 +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 != nullptr), "Invalid parameters"); - return host->mountedStoragesAsDict(); + return sg_host_get_mounted_storage_list(host); } /** \ingroup m_host_management @@ -253,8 +252,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(); + return sg_host_get_attached_storage_list(host); } /** \ingroup m_host_management @@ -266,18 +264,10 @@ 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 elm : host->mountedStorages()) + 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()