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 git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
smpi
/
smpi_bench.c
diff --git
a/src/smpi/smpi_bench.c
b/src/smpi/smpi_bench.c
index
cf8ac0d
..
ca628b9
100644
(file)
--- a/
src/smpi/smpi_bench.c
+++ b/
src/smpi/smpi_bench.c
@@
-9,6
+9,7
@@
#include "xbt/sysdep.h"
#include "xbt/ex.h"
#include "surf/surf.h"
#include "xbt/sysdep.h"
#include "xbt/ex.h"
#include "surf/surf.h"
+#include "simgrid/sg_config.h"
#ifndef WIN32
#include <sys/mman.h>
#ifndef WIN32
#include <sys/mman.h>
@@
-136,13
+137,13
@@
void smpi_execute_flops(double flops) {
static void smpi_execute(double duration)
{
/* FIXME: a global variable would be less expensive to consult than a call to xbt_cfg_get_double() right on the critical path */
static void smpi_execute(double duration)
{
/* FIXME: a global variable would be less expensive to consult than a call to xbt_cfg_get_double() right on the critical path */
- if (duration >= s
urf
_cfg_get_double("smpi/cpu_threshold")) {
+ if (duration >= s
g
_cfg_get_double("smpi/cpu_threshold")) {
XBT_DEBUG("Sleep for %f to handle real computation time", duration);
smpi_execute_flops(duration *
XBT_DEBUG("Sleep for %f to handle real computation time", duration);
smpi_execute_flops(duration *
- s
urf
_cfg_get_double("smpi/running_power"));
+ s
g
_cfg_get_double("smpi/running_power"));
} else {
XBT_DEBUG("Real computation took %f while option smpi/cpu_threshold is set to %f => ignore it",
} else {
XBT_DEBUG("Real computation took %f while option smpi/cpu_threshold is set to %f => ignore it",
- duration, s
urf
_cfg_get_double("smpi/cpu_threshold"));
+ duration, s
g
_cfg_get_double("smpi/cpu_threshold"));
}
}
}
}
@@
-168,7
+169,7
@@
unsigned int smpi_sleep(unsigned int secs)
return secs;
}
return secs;
}
-int smpi_gettimeofday(struct timeval *tv
, struct timezone *tz
)
+int smpi_gettimeofday(struct timeval *tv)
{
double now;
smpi_bench_end();
{
double now;
smpi_bench_end();