A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
try to prevent 32 bits systems from crying
[simgrid.git]
/
src
/
smpi
/
smpi_dvfs.cpp
diff --git
a/src/smpi/smpi_dvfs.cpp
b/src/smpi/smpi_dvfs.cpp
index
c0b01ac
..
e78e5b7
100644
(file)
--- a/
src/smpi/smpi_dvfs.cpp
+++ b/
src/smpi/smpi_dvfs.cpp
@@
-10,8
+10,7
@@
#include "smpi/smpi.h"
#include "src/internal_config.h"
#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
/**
* \brief Return the speed of the processor (in flop/s) at a given pstate
@@
-21,7
+20,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_dvfs, smpi,
*/
double smpi_get_host_power_peak_at(int pstate_index)
{
*/
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
+30,7
@@
double smpi_get_host_power_peak_at(int pstate_index)
*/
double smpi_get_host_current_power_peak(void)
{
*/
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
+50,7
@@
void smpi_set_host_pstate(int pstate_index)
{
sg_host_set_pstate(SIMIX_host_self(), 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());
}
int smpi_get_host_pstate() {
return sg_host_get_pstate(SIMIX_host_self());
}
@@
-69,8
+64,7
@@
double smpi_get_host_consumed_energy(void) {
return sg_host_get_consumed_energy(SIMIX_host_self());
}
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;
#if defined(__alpha__) || defined(__sparc64__) || defined(__x86_64__) || defined(__ia64__)
typedef int integer;