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' into 'master'
[simgrid.git]
/
src
/
s4u
/
s4u_Io.cpp
diff --git
a/src/s4u/s4u_Io.cpp
b/src/s4u/s4u_Io.cpp
index
9d467c7
..
924dfec
100644
(file)
--- a/
src/s4u/s4u_Io.cpp
+++ b/
src/s4u/s4u_Io.cpp
@@
-13,7
+13,7
@@
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
namespace simgrid {
namespace s4u {
namespace simgrid {
namespace s4u {
-Io::Io(sg_storage_t storage, sg_size_t size, OpType type) :
Activity(),
storage_(storage), size_(size), type_(type)
+Io::Io(sg_storage_t storage, sg_size_t size, OpType type) : storage_(storage), size_(size), type_(type)
{
Activity::set_remaining(size_);
pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
{
Activity::set_remaining(size_);
pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
@@
-21,13
+21,13
@@
Io::Io(sg_storage_t storage, sg_size_t size, OpType type) : Activity(), storage_
Io* Io::start()
{
Io* Io::start()
{
-
simix
::simcall([this] {
-
boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_
)
-
->
set_name(name_)
-
->
set_storage(storage_->get_impl())
-
->
set_size(size_)
-
->
set_type(type_)
-
->
start();
+
kernel::actor
::simcall([this] {
+
(*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)
)
+
.
set_name(name_)
+
.
set_storage(storage_->get_impl())
+
.
set_size(size_)
+
.
set_type(type_)
+
.
start();
});
state_ = State::STARTED;
return this;
});
state_ = State::STARTED;
return this;
@@
-35,7
+35,7
@@
Io* Io::start()
Io* Io::cancel()
{
Io* Io::cancel()
{
- simgrid::
simix
::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
+ simgrid::
kernel::actor
::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
state_ = State::CANCELED;
return this;
}
state_ = State::CANCELED;
return this;
}
@@
-70,13
+70,13
@@
bool Io::test()
/** @brief Returns the amount of flops that remain to be done */
double Io::get_remaining()
{
/** @brief Returns the amount of flops that remain to be done */
double Io::get_remaining()
{
- return
simix
::simcall(
+ return
kernel::actor
::simcall(
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
}
sg_size_t Io::get_performed_ioops()
{
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
}
sg_size_t Io::get_performed_ioops()
{
- return
simix
::simcall(
+ return
kernel::actor
::simcall(
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
}
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
}