X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/88fad0aaff9eb463f048bfdfe4ad6218aba44ddb..2d37e348a09783cda723c7019640ee69de168324:/src/smpi/internals/smpi_dvfs.cpp

diff --git a/src/smpi/internals/smpi_dvfs.cpp b/src/smpi/internals/smpi_dvfs.cpp
index 8fe3b4e702..18ca8a0920 100644
--- a/src/smpi/internals/smpi_dvfs.cpp
+++ b/src/smpi/internals/smpi_dvfs.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
 
 /* 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. */
@@ -17,28 +17,28 @@
 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
+ * @brief Return the speed of the processor (in flop/s) at a given pstate
  *
- * \param pstate_index pstate to test
- * \return Returns the processor speed associated with pstate_index
+ * @param pstate_index pstate to test
+ * @return Returns the processor speed associated with pstate_index
  */
 double smpi_get_host_power_peak_at(int pstate_index)
 {
-  return sg_host_self()->getPstateSpeed(pstate_index);
+  return sg_host_self()->get_pstate_speed(pstate_index);
 }
 
 /**
- * \brief Return the current speed of the processor (in flop/s)
+ * @brief Return the current speed of the processor (in flop/s)
  *
- * \return Returns the current processor speed
+ * @return Returns the current processor speed
  */
 double smpi_get_host_current_power_peak()
 {
-  return sg_host_self()->getSpeed();
+  return sg_host_self()->get_speed();
 }
 
 /**
- * \brief Return the number of pstates defined for the current host
+ * @brief Return the number of pstates defined for the current host
  */
 int smpi_get_host_nb_pstates()
 {
@@ -46,9 +46,9 @@ int smpi_get_host_nb_pstates()
 }
 
 /**
- * \brief Sets the pstate at which the processor should run
+ * @brief Sets the pstate at which the processor should run
  *
- * \param pstate_index pstate to switch to
+ * @param pstate_index pstate to switch to
  */
 void smpi_set_host_pstate(int pstate_index)
 {
@@ -60,9 +60,9 @@ int smpi_get_host_pstate() {
 }
 
 /**
- * \brief Return the total energy consumed by a host (in Joules)
+ * @brief Return the total energy consumed by a host (in Joules)
  *
- * \return Returns the consumed energy
+ * @return Returns the consumed energy
  */
 double smpi_get_host_consumed_energy() {
   return sg_host_get_consumed_energy(sg_host_self());
@@ -90,31 +90,31 @@ struct doublecomplex {
 extern "C" XBT_PUBLIC doublereal smpi_get_host_power_peak_at_(integer* pstate_index);
 doublereal smpi_get_host_power_peak_at_(integer *pstate_index)
 {
-  return static_cast<doublereal>(smpi_get_host_power_peak_at((int)*pstate_index));
+  return static_cast<doublereal>(sg_host_self()->get_pstate_speed((int)*pstate_index));
 }
 
 extern "C" XBT_PUBLIC doublereal smpi_get_host_current_power_peak_();
 doublereal smpi_get_host_current_power_peak_()
 {
-  return smpi_get_host_current_power_peak();
+  return sg_host_self()->get_speed();
 }
 
 extern "C" XBT_PUBLIC integer smpi_get_host_nb_pstates_();
 integer smpi_get_host_nb_pstates_()
 {
-  return static_cast<integer>(smpi_get_host_nb_pstates());
+  return static_cast<integer>(sg_host_self()->get_pstate_count());
 }
 
 extern "C" XBT_PUBLIC void smpi_set_host_pstate_(integer* pstate_index);
 void smpi_set_host_pstate_(integer *pstate_index)
 {
-  smpi_set_host_pstate(static_cast<int>(*pstate_index));
+  sg_host_set_pstate(sg_host_self(), (static_cast<int>(*pstate_index)));
 }
 
 extern "C" XBT_PUBLIC doublereal smpi_get_host_consumed_energy_();
 doublereal smpi_get_host_consumed_energy_()
 {
-  return static_cast<doublereal>(smpi_get_host_consumed_energy());
+  return static_cast<doublereal>(sg_host_get_consumed_energy(sg_host_self()));
 }
 
 #endif