various cleanups in actors/processes

[simgrid.git] / src / smpi / smpi_dvfs.cpp

diff --git a/src/smpi/smpi_dvfs.cpp b/src/smpi/smpi_dvfs.cpp
index 6088ab5..c19e14e 100644 (file)
--- a/src/smpi/smpi_dvfs.cpp
+++ b/src/smpi/smpi_dvfs.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2013-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2013-2017. 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. */
@@ -7,9 +6,9 @@
 #include <xbt/log.h>
 
 // FIXME: this plugin should be separated from the core
+#include "simgrid/s4u/Host.hpp"
 #include <simgrid/plugins/energy.h>
 #include <simgrid/simix.h>
-#include <simgrid/s4u/host.hpp>
 
 #include <smpi/smpi.h>
 
@@ -25,7 +24,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi, "Logging specific to SMPI (expe
  */
 double smpi_get_host_power_peak_at(int pstate_index)
 {
-  return SIMIX_host_self()->getPstateSpeed(pstate_index);
+  return sg_host_self()->getPstateSpeed(pstate_index);
 }
 
 /**
@@ -35,7 +34,7 @@ double smpi_get_host_power_peak_at(int pstate_index)
  */
 double smpi_get_host_current_power_peak()
 {
-  return SIMIX_host_self()->speed();
+  return sg_host_self()->speed();
 }
 
 /**
@@ -43,7 +42,7 @@ double smpi_get_host_current_power_peak()
  */
 int smpi_get_host_nb_pstates()
 {
-  return sg_host_get_nb_pstates(SIMIX_host_self());
+  return sg_host_get_nb_pstates(sg_host_self());
 }
 
 /**
@@ -53,11 +52,11 @@ int smpi_get_host_nb_pstates()
  */
 void smpi_set_host_pstate(int pstate_index)
 {
-  sg_host_set_pstate(SIMIX_host_self(), pstate_index);
+  sg_host_set_pstate(sg_host_self(), pstate_index);
 }
 /** @brief Gets the pstate at which the processor currently running */
 int smpi_get_host_pstate() {
-  return sg_host_get_pstate(SIMIX_host_self());
+  return sg_host_get_pstate(sg_host_self());
 }
 
 /**
@@ -66,17 +65,15 @@ int smpi_get_host_pstate() {
  * \return Returns the consumed energy
  */
 double smpi_get_host_consumed_energy() {
-  return sg_host_get_consumed_energy(SIMIX_host_self());
+  return sg_host_get_consumed_energy(sg_host_self());
 }
 
 #if SMPI_FORTRAN
 
 #if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
 typedef int integer;
-typedef unsigned int uinteger;
 #else
 typedef long int integer;
-typedef unsigned long int uinteger;
 #endif
 typedef char *address;
 typedef short int shortint;