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
/
internals
/
smpi_bench.cpp
diff --git
a/src/smpi/internals/smpi_bench.cpp
b/src/smpi/internals/smpi_bench.cpp
index
0b0c168
..
281d79f
100644
(file)
--- a/
src/smpi/internals/smpi_bench.cpp
+++ b/
src/smpi/internals/smpi_bench.cpp
@@
-30,7
+30,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(smpi_bench, smpi, "Logging specific to SMPI (ben
double smpi_cpu_threshold = -1;
double smpi_host_speed;
double smpi_cpu_threshold = -1;
double smpi_host_speed;
-
shared_malloc_type smpi_cfg_shared_malloc = shmalloc_global
;
+
SharedMallocType smpi_cfg_shared_malloc = SharedMallocType::GLOBAL
;
double smpi_total_benched_time = 0;
extern "C" XBT_PUBLIC void smpi_execute_flops_(double* flops);
double smpi_total_benched_time = 0;
extern "C" XBT_PUBLIC void smpi_execute_flops_(double* flops);
@@
-82,7
+82,7
@@
void smpi_execute_benched(double duration)
void smpi_bench_begin()
{
void smpi_bench_begin()
{
- if (smpi_privatize_global_variables == SmpiPrivStrategies::M
map
) {
+ if (smpi_privatize_global_variables == SmpiPrivStrategies::M
MAP
) {
smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
smpi_switch_data_segment(simgrid::s4u::Actor::self());
}
@@
-180,7
+180,7
@@
static unsigned int private_sleep(double secs)
smpi_bench_end();
XBT_DEBUG("Sleep for: %lf secs", secs);
smpi_bench_end();
XBT_DEBUG("Sleep for: %lf secs", secs);
- int rank =
MPI_COMM_WORLD->rank
();
+ int rank =
simgrid::s4u::this_actor::get_pid
();
TRACE_smpi_sleeping_in(rank, secs);
simcall_process_sleep(secs);
TRACE_smpi_sleeping_in(rank, secs);
simcall_process_sleep(secs);