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
27ff69f
..
924dfec
100644
(file)
--- a/
src/s4u/s4u_Io.cpp
+++ b/
src/s4u/s4u_Io.cpp
@@
-6,7
+6,6
@@
#include "simgrid/s4u/Io.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "src/kernel/activity/IoImpl.hpp"
#include "simgrid/s4u/Io.hpp"
#include "simgrid/s4u/Storage.hpp"
#include "src/kernel/activity/IoImpl.hpp"
-#include "src/simix/smx_io_private.hpp"
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
#include "xbt/log.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(s4u_io, s4u_activity, "S4U asynchronous IOs");
@@
-14,23
+13,29
@@
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_);
{
Activity::set_remaining(size_);
- pimpl_ = simix::simcall(
- [this] { return kernel::activity::IoImplPtr(new kernel::activity::IoImpl(name_, storage_->get_impl())); });
+ pimpl_ = kernel::activity::IoImplPtr(new kernel::activity::IoImpl());
}
Io* Io::start()
{
}
Io* Io::start()
{
- simix::simcall([this] { dynamic_cast<kernel::activity::IoImpl*>(pimpl_.get())->start(size_, type_); });
+ 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;
}
Io* Io::cancel()
{
state_ = State::STARTED;
return this;
}
Io* Io::cancel()
{
- simgrid::
simix::simcall([this] { dynamic_cast<kernel::activity::IoImpl*>(pimpl_.get()
)->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;
}
@@
-45,7
+50,6
@@
Io* Io::wait()
Io* Io::wait_for(double)
{
THROW_UNIMPLEMENTED;
Io* Io::wait_for(double)
{
THROW_UNIMPLEMENTED;
- return this;
}
bool Io::test()
}
bool Io::test()
@@
-60,19
+64,19
@@
bool Io::test()
THROW_UNIMPLEMENTED;
THROW_UNIMPLEMENTED;
- return false;
+ // return false
}
/** @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
simgrid::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
simgrid::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(); });
}