X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5180ef8a951643b07bf2d6f8b8f13138fff7389b..bcb5cde966bef9e174da1c93cdb2158c0880a613:/src/msg/msg_host.cpp

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index 968ae5d882..285d76a06e 100644
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -1,13 +1,14 @@
-/* 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 "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);
 
@@ -19,7 +20,7 @@ int sg_storage_max_file_descriptors = 1024;
 
 /** @addtogroup m_host_management
  * (#msg_host_t) and the functions for managing it.
- *  
+ *
  *  A <em>location</em> (or <em>host</em>) is any possible place where  a process may run. Thus it may be represented
  *  as a <em>physical resource with computing capabilities</em>, some <em>mailboxes</em> to enable running process to
  *  communicate with remote ones, and some <em>private data</em> that can be only accessed by local process.
@@ -73,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)
@@ -85,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)
@@ -102,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)
  */
@@ -114,7 +115,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();
+  return host->getSpeed();
 }
 
 /** \ingroup m_host_management
@@ -133,7 +134,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
@@ -146,7 +147,7 @@ void MSG_host_get_process_list(msg_host_t host, xbt_dynar_t whereto)
 {
   xbt_assert((host != nullptr), "Invalid parameters");
   smx_actor_t actor = NULL;
-  xbt_swag_foreach(actor, host->processes()) {
+  xbt_swag_foreach(actor, host->extension<simgrid::simix::Host>()->process_list) {
     msg_process_t p = actor->ciface();
     xbt_dynar_push(whereto, &p);
   }
@@ -173,7 +174,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 != nullptr), "Invalid parameters (host is nullptr)");
-  return host->properties();
+  return host->getProperties();
 }
 
 /** \ingroup m_host_management
@@ -191,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
@@ -204,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)
 {
@@ -212,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
@@ -224,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
  */
@@ -250,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
@@ -273,19 +264,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 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<msg_storage_t>(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;
 }