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_ = 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()
{
- simix::simcall([this] { static_cast<kernel::activity::IoImpl*>(pimpl_.get())->start(size_, type_); });
+ 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();
+ });
state_ = State::STARTED;
return this;
}
Io* Io::cancel()
{
- simgrid::simix::simcall([this] { static_cast<kernel::activity::IoImpl*>(pimpl_.get())->cancel(); });
+ simgrid::simix::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
state_ = State::CANCELED;
return this;
}
Io* Io::wait_for(double)
{
THROW_UNIMPLEMENTED;
- return this;
}
bool Io::test()
THROW_UNIMPLEMENTED;
- return false;
+ // return false
}
/** @brief Returns the amount of flops that remain to be done */
double Io::get_remaining()
{
- return simgrid::simix::simcall(
+ return simix::simcall(
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
}
sg_size_t Io::get_performed_ioops()
{
- return simgrid::simix::simcall(
+ return simix::simcall(
[this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
}