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
Modernize simcall_io_test().
[simgrid.git]
/
src
/
s4u
/
s4u_Io.cpp
diff --git
a/src/s4u/s4u_Io.cpp
b/src/s4u/s4u_Io.cpp
index
73149eb
..
ddfaa61
100644
(file)
--- a/
src/s4u/s4u_Io.cpp
+++ b/
src/s4u/s4u_Io.cpp
@@
-63,7
+63,7
@@
Io* Io::wait_for(double timeout)
{
if (state_ == State::INITED)
vetoable_start();
- simcall_io_wait(
pimpl_
, timeout);
+ simcall_io_wait(
get_impl()
, timeout);
state_ = State::FINISHED;
this->release_dependencies();
return this;
@@
-80,7
+80,7
@@
bool Io::test()
if (state_ == State::INITED || state_ == State::STARTING)
this->vetoable_start();
- if (
simcall_io_test(pimpl_
)) {
+ if (
kernel::actor::simcall([this] { return this->get_impl()->test(); }
)) {
state_ = State::FINISHED;
this->release_dependencies();
return true;
@@
-90,16
+90,15
@@
bool Io::test()
}
/** @brief Returns the amount of flops that remain to be done */
-double Io::get_remaining()
+double Io::get_remaining()
const
{
return kernel::actor::simcall(
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
}
-sg_size_t Io::get_performed_ioops()
+sg_size_t Io::get_performed_ioops()
const
{
- return kernel::actor::simcall(
- [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
+ return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops();
}
} // namespace s4u