X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/09a6b890a4e7f2319ee03d69119d36781c52fd57..6c6e9129b8c8a2404310f460327314afa3fb9b8b:/src/msg/msg_host.cpp

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index ee9ac40e64..140253967e 100644
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -9,7 +9,7 @@
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "simgrid/simix.h"
-#include "simgrid/Host.hpp"
+#include <simgrid/s4u/host.hpp>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(msg);
 
@@ -73,7 +73,7 @@ msg_host_t __MSG_host_create(sg_host_t host) // FIXME: don't return our paramete
  */
 msg_host_t MSG_host_by_name(const char *name)
 {
-  return simgrid::Host::by_name_or_null(name);
+  return simgrid::s4u::Host::by_name_or_null(name);
 }
 
 /** \ingroup m_host_management
@@ -128,7 +128,7 @@ msg_host_t MSG_host_self(void)
  */
 void MSG_host_on(msg_host_t host)
 {
-  host->on();
+  host->turnOn();
 }
 
 /** \ingroup m_host_management
@@ -139,7 +139,7 @@ void MSG_host_on(msg_host_t host)
  */
 void MSG_host_off(msg_host_t host)
 {
-  host->off();
+  host->turnOff();
 }
 
 /*
@@ -181,7 +181,7 @@ msg_host_t *MSG_get_host_table(void)
 
     xbt_lib_cursor_t cursor;
     const char *id;
-    simgrid::Host* host;
+    simgrid::s4u::Host* host;
     xbt_dict_foreach(host_list, cursor, id, host)
       if(routing_get_network_element_type(key) == SURF_NETWORK_ELEMENT_HOST)
         array[i++] = host->facet(MSG_HOST_LEVEL);
@@ -280,7 +280,7 @@ void MSG_host_set_property_value(msg_host_t host, const char *name, char *value,
 int MSG_host_is_on(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-  return sg_host_get_state(host);
+  return sg_host_is_on(host);
 }
 /** @ingroup m_host_management
  *
@@ -291,7 +291,7 @@ int MSG_host_is_on(msg_host_t host)
 int MSG_host_is_off(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-  return !(sg_host_get_state(host));
+  return !(sg_host_is_on(host));
 }
 
 /** \ingroup m_host_management
@@ -348,50 +348,6 @@ int MSG_host_get_nb_pstates(msg_host_t host) {
 	  return sg_host_get_nb_pstates(host);
 }
 
-/** \ingroup m_host_management
- * \brief Sets the speed of the processor (in flop/s) at a given pstate. See also @ref SURF_plugin_energy.
- *
- * \param  host host to test
- * \param pstate_index pstate to switch to
- */
-void MSG_host_set_pstate(msg_host_t host, int pstate_index) {
-	  xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-    host->setPstate(pstate_index);
-}
-/** \ingroup m_host_management
- * \brief Gets the pstate at which the given host is currently running. See also @ref SURF_plugin_energy.
- *
- * \param  host host to test
- */
-int MSG_host_get_pstate(msg_host_t host) {
-	  return sg_host_get_pstate(host);
-}
-
-/** \ingroup m_host_management
- * \brief Return the total energy consumed by a host (in Joules). See also @ref SURF_plugin_energy.
- *
- * \param  host host to test
- * \return Returns the consumed energy
- */
-double MSG_host_get_consumed_energy(msg_host_t host) {
-	  xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-	  return sg_host_get_consumed_energy(host);
-}
-/** \ingroup m_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host is idling
- *
- */
-double MSG_host_get_wattmin_at(msg_host_t host, int pstate){
-	return host->getWattMinAt(pstate);
-}
-/** \ingroup m_host_management
- * \brief Returns the amount of watt dissipated at the given pstate when the host burns CPU at 100%
- *
- */
-double MSG_host_get_wattmax_at(msg_host_t host, int pstate){
-	return host->getWattMaxAt(pstate);
-}
-
 /** \ingroup m_host_management
  * \brief Return the list of mount point names on an host.
  * \param host a host