Do the Right Thing for the host_(get/set)_pstate

[simgrid.git] / src / msg / msg_host.cpp

diff --git a/src/msg/msg_host.cpp b/src/msg/msg_host.cpp
index c6a6e3e..31fd77f 100644 (file)
--- a/src/msg/msg_host.cpp
+++ b/src/msg/msg_host.cpp
@@ -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.
  */
@@ -214,11 +202,8 @@ xbt_dynar_t MSG_hosts_as_dynar(void) {
  * \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();
 }
 
 
@@ -228,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
@@ -244,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();
 }
 
 
@@ -270,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
@@ -300,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
  *
@@ -311,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
@@ -322,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
@@ -333,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
@@ -345,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
@@ -356,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
@@ -368,26 +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.
  *
@@ -403,14 +363,14 @@ double MSG_host_get_consumed_energy(msg_host_t host) {
  *
  */
 double MSG_host_get_wattmin_at(msg_host_t host, int pstate){
-       return simcall_host_get_wattmin_at(host, 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 simcall_host_get_wattmax_at(host, pstate);
+       return host->getWattMaxAt(pstate);
 }
 
 /** \ingroup m_host_management
@@ -421,7 +381,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
@@ -432,7 +392,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
@@ -449,7 +409,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);