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
Apply the default settings of 'smpi/buffering' too
[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
a10ac85
..
ac32fa2
100644
(file)
--- a/
src/smpi/internals/smpi_bench.cpp
+++ b/
src/smpi/internals/smpi_bench.cpp
@@
-176,7
+176,7
@@
static unsigned int private_sleep(double secs)
int rank = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_sleeping_in(rank, secs);
int rank = simgrid::s4u::this_actor::get_pid();
TRACE_smpi_sleeping_in(rank, secs);
- sim
call_process_sleep
(secs);
+ sim
grid::s4u::this_actor::sleep_for
(secs);
TRACE_smpi_sleeping_out(rank);
TRACE_smpi_sleeping_out(rank);
@@
-188,14
+188,14
@@
unsigned int smpi_sleep(unsigned int secs)
{
if (not smpi_process())
return sleep(secs);
{
if (not smpi_process())
return sleep(secs);
- return private_sleep(s
tatic_cast<double>(secs)
);
+ return private_sleep(s
ecs
);
}
int smpi_usleep(useconds_t usecs)
{
if (not smpi_process())
return usleep(usecs);
}
int smpi_usleep(useconds_t usecs)
{
if (not smpi_process())
return usleep(usecs);
- return static_cast<int>(private_sleep(
static_cast<double>(usecs)
/ 1000000.0));
+ return static_cast<int>(private_sleep(
usecs
/ 1000000.0));
}
#if _POSIX_TIMERS > 0
}
#if _POSIX_TIMERS > 0
@@
-203,7
+203,7
@@
int smpi_nanosleep(const struct timespec* tp, struct timespec* t)
{
if (not smpi_process())
return nanosleep(tp,t);
{
if (not smpi_process())
return nanosleep(tp,t);
- return static_cast<int>(private_sleep(
static_cast<double>(tp->tv_sec + tp->tv_nsec / 1000000000.0)
));
+ return static_cast<int>(private_sleep(
tp->tv_sec + tp->tv_nsec / 1000000000.0
));
}
#endif
}
#endif
@@
-223,7
+223,7
@@
int smpi_gettimeofday(struct timeval* tv, struct timezone* tz)
#endif
}
if (smpi_wtime_sleep > 0)
#endif
}
if (smpi_wtime_sleep > 0)
- sim
call_process_sleep
(smpi_wtime_sleep);
+ sim
grid::s4u::this_actor::sleep_for
(smpi_wtime_sleep);
smpi_bench_begin();
return 0;
}
smpi_bench_begin();
return 0;
}
@@
-241,7
+241,7
@@
int smpi_clock_gettime(clockid_t clk_id, struct timespec* tp)
tp->tv_nsec = static_cast<long int>((now - tp->tv_sec) * 1e9);
}
if (smpi_wtime_sleep > 0)
tp->tv_nsec = static_cast<long int>((now - tp->tv_sec) * 1e9);
}
if (smpi_wtime_sleep > 0)
- sim
call_process_sleep
(smpi_wtime_sleep);
+ sim
grid::s4u::this_actor::sleep_for
(smpi_wtime_sleep);
smpi_bench_begin();
return 0;
}
smpi_bench_begin();
return 0;
}
@@
-254,7
+254,7
@@
double smpi_mpi_wtime()
smpi_bench_end();
time = SIMIX_get_clock();
if (smpi_wtime_sleep > 0)
smpi_bench_end();
time = SIMIX_get_clock();
if (smpi_wtime_sleep > 0)
- sim
call_process_sleep
(smpi_wtime_sleep);
+ sim
grid::s4u::this_actor::sleep_for
(smpi_wtime_sleep);
smpi_bench_begin();
} else {
time = SIMIX_get_clock();
smpi_bench_begin();
} else {
time = SIMIX_get_clock();
@@
-416,7
+416,7
@@
void smpi_sample_3(int global, const char *file, int line)
double period = xbt_os_timer_elapsed(smpi_process()->timer());
data.sum += period;
data.sum_pow2 += period * period;
double period = xbt_os_timer_elapsed(smpi_process()->timer());
data.sum += period;
data.sum_pow2 += period * period;
- double n =
static_cast<double>(data.count)
;
+ double n =
data.count
;
data.mean = data.sum / n;
data.relstderr = sqrt((data.sum_pow2 / n - data.mean * data.mean) / n) / data.mean;
data.mean = data.sum / n;
data.relstderr = sqrt((data.sum_pow2 / n - data.mean * data.mean) / n) / data.mean;