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

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index 209e29620a..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::find_host(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)
 {
-  simcall_host_on(host);
+  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)
 {
-  simcall_host_off(host);
+  host->turnOff();
 }
 
 /*
@@ -163,18 +163,6 @@ void __MSG_host_priv_free(msg_host_priv_t priv)
   free(priv);
 }
 
-/*
- * \brief Destroys a host (internal call only)
- */
-void __MSG_host_destroy(msg_host_t host) //FIXME: killme?
-{
-  /* TODO:
-   * What happens if VMs still remain on this host?
-   * Revisit here after the surf layer gets stable.
-   **/
-  sg_host_msg_destroy(host);
-}
-
 /** \ingroup m_host_management
  * \brief Return the current number MSG hosts.
  */
@@ -193,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);
@@ -210,27 +198,12 @@ xbt_dynar_t MSG_hosts_as_dynar(void) {
   return sg_hosts_as_dynar();
 }
 
-/** \ingroup m_host_management
- * \brief Return the number of MSG tasks currently running on a
- * #msg_host_t. The external load is not taken in account.
- */
-int MSG_get_host_msgload(msg_host_t h)
-{
-  xbt_assert((h != NULL), "Invalid parameters");
-  xbt_die( "Not implemented yet");
-
-  return (0);
-}
-
 /** \ingroup m_host_management
  * \brief Return the speed of the processor (in flop/s), regardless of 
     the current load on the machine.
  */
-double MSG_get_host_speed(msg_host_t h)
-{
-  xbt_assert((h != NULL), "Invalid parameters");
-
-  return sg_host_get_speed(h);
+double MSG_get_host_speed(msg_host_t host) {
+  return host->getSpeed();
 }
 
 
@@ -240,11 +213,8 @@ double MSG_get_host_speed(msg_host_t h)
  * \param host a host
  * \return the number of cores
  */
-int MSG_host_get_core_number(msg_host_t host)
-{
-  xbt_assert((host != NULL), "Invalid parameters");
-
-  return sg_host_get_core(host);
+int MSG_host_get_core_number(msg_host_t host) {
+  return host->getCoreAmount();
 }
 
 /** \ingroup m_host_management
@@ -256,8 +226,7 @@ int MSG_host_get_core_number(msg_host_t host)
 xbt_swag_t MSG_host_get_process_list(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters");
-
-  return (simcall_host_get_process_list(host));
+  return host->getProcessList();
 }
 
 
@@ -282,8 +251,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 != NULL), "Invalid parameters (host is NULL)");
-
-  return (simcall_host_get_properties(host));
+  return host->getProperties();
 }
 
 /** \ingroup m_host_management
@@ -312,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
  *
@@ -323,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
@@ -334,7 +302,7 @@ int MSG_host_is_off(msg_host_t host)
  */
 void MSG_host_set_params(msg_host_t host, vm_params_t params)
 {
-  simcall_host_set_params(host, params);
+  host->setParams(params);
 }
 
 /** \ingroup m_host_management
@@ -345,7 +313,7 @@ void MSG_host_set_params(msg_host_t host, vm_params_t params)
  */
 void MSG_host_get_params(msg_host_t host, vm_params_t params)
 {
-  simcall_host_get_params(host, params);
+  host->getParams(params);
 }
 
 /** \ingroup m_host_management
@@ -357,7 +325,7 @@ void MSG_host_get_params(msg_host_t host, vm_params_t params)
  */
 double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) {
 	  xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-	  return (simcall_host_get_power_peak_at(host, pstate_index));
+	  return host->getPowerPeakAt(pstate_index);
 }
 
 /** \ingroup m_host_management
@@ -368,7 +336,7 @@ double MSG_host_get_power_peak_at(msg_host_t host, int pstate_index) {
  */
 double MSG_host_get_current_power_peak(msg_host_t host) {
 	  xbt_assert((host != NULL), "Invalid parameters (host is NULL)");
-	  return simcall_host_get_current_power_peak(host);
+	  return host->getCurrentPowerPeak();
 }
 
 /** \ingroup m_host_management
@@ -380,51 +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)");
-
-	  simcall_host_set_pstate(host, 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 simcall_host_get_wattmin_at(host, 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 simcall_host_get_wattmax_at(host, pstate);
-}
-
 /** \ingroup m_host_management
  * \brief Return the list of mount point names on an host.
  * \param host a host
@@ -433,7 +356,7 @@ double MSG_host_get_wattmax_at(msg_host_t host, int pstate){
 xbt_dict_t MSG_host_get_mounted_storage_list(msg_host_t host)
 {
   xbt_assert((host != NULL), "Invalid parameters");
-  return (simcall_host_get_mounted_storage_list(host));
+  return host->getMountedStorageList();
 }
 
 /** \ingroup m_host_management
@@ -444,7 +367,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 != NULL), "Invalid parameters");
-  return (simcall_host_get_attached_storage_list(host));
+  return host->getAttachedStorageList();
 }
 
 /** \ingroup m_host_management
@@ -461,7 +384,7 @@ xbt_dict_t MSG_host_get_storage_content(msg_host_t host)
   char* mount_name;
   xbt_dict_cursor_t cursor = NULL;
 
-  xbt_dict_t storage_list = simcall_host_get_mounted_storage_list(host);
+  xbt_dict_t storage_list = host->getMountedStorageList();
 
   xbt_dict_foreach(storage_list,cursor,mount_name,storage_name){
     storage = (msg_storage_t)xbt_lib_get_elm_or_null(storage_lib,storage_name);