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
30ebf50
..
ddfaa61
100644
(file)
--- a/
src/s4u/s4u_Io.cpp
+++ b/
src/s4u/s4u_Io.cpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2018-20
19
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2018-20
20
. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
@@
-9,8
+9,6
@@
#include "src/kernel/activity/IoImpl.hpp"
#include "xbt/log.h"
#include "src/kernel/activity/IoImpl.hpp"
#include "xbt/log.h"
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
-
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
@@
-58,42
+56,49
@@
Io* Io::cancel()
Io* Io::wait()
{
Io* Io::wait()
{
- simcall_io_wait(pimpl_);
- state_ = State::FINISHED;
- return this;
+ return this->wait_for(-1);
}
}
-Io* Io::wait_for(double)
+Io* Io::wait_for(double
timeout
)
{
{
- THROW_UNIMPLEMENTED;
+ if (state_ == State::INITED)
+ vetoable_start();
+ simcall_io_wait(get_impl(), timeout);
+ state_ = State::FINISHED;
+ this->release_dependencies();
+ return this;
}
bool Io::test()
{
}
bool Io::test()
{
- xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED);
+ xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
+ state_ == State::FINISHED);
if (state_ == State::FINISHED)
return true;
if (state_ == State::FINISHED)
return true;
- if (state_ == State::INITED)
- this->start();
+ if (state_ == State::INITED
|| state_ == State::STARTING
)
+ this->
vetoable_
start();
- THROW_UNIMPLEMENTED;
+ if (kernel::actor::simcall([this] { return this->get_impl()->test(); })) {
+ state_ = State::FINISHED;
+ this->release_dependencies();
+ return true;
+ }
- // return false
+ return false;
}
/** @brief Returns the amount of flops that remain to be done */
}
/** @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(); });
}
{
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
}
} // namespace s4u