X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6badbbf58554a35b03f58509b0b18cf606c38f5e..e6f32ee88c53d311ae1aaf409b886c60307a0af4:/src/simgrid/host.cpp

diff --git a/src/simgrid/host.cpp b/src/simgrid/host.cpp
index af13e1a514..3d1a48ab8c 100644
--- a/src/simgrid/host.cpp
+++ b/src/simgrid/host.cpp
@@ -138,15 +138,7 @@ double sg_host_get_available_speed(sg_host_t host){
  *  @return 1 if the host is active or 0 if it has crashed.
  */
 int sg_host_is_on(sg_host_t host) {
-	return host->p_cpu->isOn();
-}
-
-/** @brief Returns the total energy consumed by the host (in Joules).
- *
- *  See also @ref SURF_plugin_energy.
- */
-double sg_host_get_consumed_energy(sg_host_t host) {
-	return surf_host_get_consumed_energy(host);
+	return host->pimpl_cpu->isOn();
 }
 
 /** @brief Returns the number of power states for a host.
@@ -154,7 +146,7 @@ double sg_host_get_consumed_energy(sg_host_t host) {
  *  See also @ref SURF_plugin_energy.
  */
 int sg_host_get_nb_pstates(sg_host_t host) {
-	return surf_host_get_nb_pstates(host);
+  return host->pimpl_cpu->getNbPStates();
 }
 
 /** @brief Gets the pstate at which that host currently runs.
@@ -162,7 +154,14 @@ int sg_host_get_nb_pstates(sg_host_t host) {
  *  See also @ref SURF_plugin_energy.
  */
 int sg_host_get_pstate(sg_host_t host) {
-	return surf_host_get_pstate(host);
+  return host->getPState();
+}
+/** @brief Sets the pstate at which that host should run.
+ *
+ *  See also @ref SURF_plugin_energy.
+ */
+void sg_host_set_pstate(sg_host_t host,int pstate) {
+  host->setPState(pstate);
 }
 
 namespace simgrid {
@@ -177,13 +176,13 @@ Host::~Host()
 }
 
 /** Start the host if it is off */
-void Host::on()
+void Host::turnOn()
 {
   simgrid::simix::kernel(std::bind(SIMIX_host_on, this));
 }
 
 /** Stop the host if it is on */
-void Host::off()
+void Host::turnOff()
 {
   /* Go to that function to follow the code flow through the simcall barrier */
   if (0) simcall_HANDLER_host_off(&SIMIX_process_self()->simcall, this);
@@ -191,23 +190,25 @@ void Host::off()
 }
 
 bool Host::isOn() {
-  return p_cpu->isOn();
+  return pimpl_cpu->isOn();
 }
 bool Host::isOff() {
-  return ! p_cpu->isOn();
+  return ! pimpl_cpu->isOn();
 }
 
 
 /** Get the properties assigned to a host */
 xbt_dict_t Host::getProperties()
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_host_get_properties, this));
+  return simgrid::simix::kernel(std::bind(sg_host_get_properties, this));
 }
 
 /** Get the processes attached to the host */
 xbt_swag_t Host::getProcessList()
 {
-  return simgrid::simix::kernel(std::bind(SIMIX_host_get_process_list, this));
+  return simgrid::simix::kernel([&]() {
+    return ((smx_host_priv_t)this->extension(SIMIX_HOST_LEVEL))->process_list;
+  });
 }
 
 /** Get the peak power of a host */
@@ -226,11 +227,11 @@ double Host::getPowerPeakAt(int pstate_index)
 
 /** @brief Get the speed of the cpu associated to a host */
 double Host::getSpeed() {
-	return p_cpu->getSpeed(1.0);
+	return pimpl_cpu->getSpeed(1.0);
 }
 /** @brief Returns the number of core of the processor. */
 int Host::getCoreAmount() {
-	return p_cpu->getCore();
+	return pimpl_cpu->getCore();
 }
 
 Host* Host::by_name_or_null(const char* name)
@@ -248,25 +249,17 @@ Host* Host::by_name_or_create(const char* name)
   return host;
 }
 
-/** Set the pstate at which the host should run */
-void Host::setPstate(int pstate_index)
-{
-  simgrid::simix::kernel(
-    std::bind(SIMIX_host_set_pstate, this, pstate_index));
-}
-
-/** Get the amount of watt dissipated at the given pstate when the host is idling */
-double Host::getWattMinAt(int pstate)
+/** @brief Set the pstate at which the host should run */
+void Host::setPState(int pstate_index)
 {
-  return simgrid::simix::kernel(
-    std::bind(SIMIX_host_get_wattmin_at, this, pstate));
+  simgrid::simix::kernel(std::bind(
+      &simgrid::surf::Cpu::setPState, pimpl_cpu, pstate_index
+  ));
 }
-
-/** Get the amount of watt dissipated at the given pstate when the host burns CPU at 100% */
-double Host::getWattMaxAt(int pstate)
+/** @brief Retrieve the pstate at which the host is currently running */
+int Host::getPState()
 {
-  return simgrid::simix::kernel(
-    std::bind(SIMIX_host_get_wattmax_at, this, pstate));
+  return pimpl_cpu->getPState();
 }
 
 void Host::getParams(vm_params_t params)