X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..d4fb7b9d845c48b3274774833a3b848750a73766:/src/smpi/smpi_dvfs.cpp

diff --git a/src/smpi/smpi_dvfs.cpp b/src/smpi/smpi_dvfs.cpp
index c0b01ac9ed..8c161927c6 100644
--- a/src/smpi/smpi_dvfs.cpp
+++ b/src/smpi/smpi_dvfs.cpp
@@ -4,14 +4,18 @@
 /* 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/plugins/energy.h" // FIXME: this plugin should be separated from the core
-#include "xbt/log.h"
-#include "simgrid/simix.h"
-#include "smpi/smpi.h"
+#include <xbt/log.h>
+
+// FIXME: this plugin should be separated from the core
+#include <simgrid/plugins/energy.h>
+#include <simgrid/simix.h>
+#include <simgrid/s4u/host.hpp>
+
+#include <smpi/smpi.h>
+
 #include "src/internal_config.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi,
-                                "Logging specific to SMPI (experimental DVFS support)");
+XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi, "Logging specific to SMPI (experimental DVFS support)");
 
 /**
  * \brief Return the speed of the processor (in flop/s) at a given pstate
@@ -21,7 +25,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi,
  */
 double smpi_get_host_power_peak_at(int pstate_index)
 {
-  return simcall_host_get_power_peak_at(SIMIX_host_self(), pstate_index);
+  return SIMIX_host_self()->getPstateSpeed(pstate_index);
 }
 
 /**
@@ -31,7 +35,7 @@ double smpi_get_host_power_peak_at(int pstate_index)
  */
 double smpi_get_host_current_power_peak(void)
 {
-  return simcall_host_get_current_power_peak(SIMIX_host_self());
+  return SIMIX_host_self()->getPstateSpeedCurrent();
 }
 
 /**
@@ -51,11 +55,7 @@ void smpi_set_host_pstate(int pstate_index)
 {
   sg_host_set_pstate(SIMIX_host_self(), pstate_index);
 }
-/**
- * \brief Gets the pstate at which the processor currently running
- *
- * \param pstate_index pstate to switch to
- */
+/** @brief Gets the pstate at which the processor currently running */
 int smpi_get_host_pstate() {
   return sg_host_get_pstate(SIMIX_host_self());
 }
@@ -69,8 +69,7 @@ double smpi_get_host_consumed_energy(void) {
   return sg_host_get_consumed_energy(SIMIX_host_self());
 }
 
-
-#ifdef SMPI_FORTRAN
+#if SMPI_FORTRAN
 
 #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
 typedef int integer;