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
Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
smpi_dvfs.c
diff --git
a/src/smpi/smpi_dvfs.c
b/src/smpi/smpi_dvfs.c
index
395f84e
..
3c16f52
100644
(file)
--- a/
src/smpi/smpi_dvfs.c
+++ b/
src/smpi/smpi_dvfs.c
@@
-1,4
+1,4
@@
-/* Copyright (c) 2013-201
4
. The SimGrid Team.
+/* Copyright (c) 2013-201
5
. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
@@
-7,7
+7,7
@@
#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)");
@@
-42,7
+42,7
@@
int smpi_get_host_nb_pstates(void)
}
/**
}
/**
- * \brief Sets the
speed of the processor (in flop/s) at a given pstate
+ * \brief Sets the
pstate at which the processor should run
*
* \param pstate_index pstate to switch to
*/
*
* \param pstate_index pstate to switch to
*/
@@
-50,15
+50,22
@@
void smpi_set_host_pstate(int pstate_index)
{
simcall_host_set_pstate(SIMIX_host_self(), pstate_index);
}
{
simcall_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
+ */
+int smpi_get_host_pstate() {
+ return sg_host_get_pstate(SIMIX_host_self());
+}
/**
* \brief Return the total energy consumed by a host (in Joules)
*
* \return Returns the consumed energy
*/
/**
* \brief Return the total energy consumed by a host (in Joules)
*
* \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());
}
}