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
[DOC] Fixed even more errors.
[simgrid.git]
/
src
/
smpi
/
smpi_dvfs.c
diff --git
a/src/smpi/smpi_dvfs.c
b/src/smpi/smpi_dvfs.c
index
d609b93
..
6b8d99e
100644
(file)
--- a/
src/smpi/smpi_dvfs.c
+++ b/
src/smpi/smpi_dvfs.c
@@
-4,10
+4,11
@@
/* 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. */
/* 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"
#include "simgrid/simix.h"
#include "smpi/smpi.h"
-#include "internal_config.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)");
@@
-34,11
+35,11
@@
double smpi_get_host_current_power_peak(void)
}
/**
}
/**
- * \brief Return the number of pstates defined for host
+ * \brief Return the number of pstates defined for
the current
host
*/
int smpi_get_host_nb_pstates(void)
{
*/
int smpi_get_host_nb_pstates(void)
{
- return s
imcall
_host_get_nb_pstates(SIMIX_host_self());
+ return s
g
_host_get_nb_pstates(SIMIX_host_self());
}
/**
}
/**
@@
-48,16
+49,15
@@
int smpi_get_host_nb_pstates(void)
*/
void smpi_set_host_pstate(int pstate_index)
{
*/
void smpi_set_host_pstate(int pstate_index)
{
- s
imcall
_host_set_pstate(SIMIX_host_self(), pstate_index);
+ s
g
_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
*
* \param pstate_index pstate to switch to
*/
-int smpi_get_host_pstate()
-{
- return simcall_host_get_pstate(SIMIX_host_self());
+int smpi_get_host_pstate() {
+ return sg_host_get_pstate(SIMIX_host_self());
}
/**
}
/**
@@
-65,9
+65,8
@@
int smpi_get_host_pstate()
*
* \return Returns the consumed energy
*/
*
* \return Returns the consumed energy
*/
-double smpi_get_host_consumed_energy(void)
-{
- return simcall_host_get_consumed_energy(SIMIX_host_self());
+double smpi_get_host_consumed_energy(void) {
+ return sg_host_get_consumed_energy(SIMIX_host_self());
}
}