#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");
Activity* Io::start()
{
- pimpl_ = simcall_io_start(size_, storage_);
+ Activity::set_remaining(size_);
+ pimpl_ = simix::simcall([this] {
+ return boost::static_pointer_cast<kernel::activity::IoImpl>(SIMIX_io_start(name_, size_, storage_, type_));
+ });
state_ = State::STARTED;
return this;
}
return this;
}
-// Activity* Exec::wait()
-//{
-// simcall_execution_wait(pimpl_);
-// state_ = State::FINISHED;
-// return this;
-//}
-//
-// Activity* Exec::wait(double timeout)
-//{
-// THROW_UNIMPLEMENTED;
-// return this;
-//}
-//
-///** @brief Returns whether the state of the exec is finished */
-// bool Exec::test()
-//{
-// xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED);
-//
-// if (state_ == State::FINISHED)
-// return true;
-//
-// if (state_ == State::INITED)
-// this->start();
-//
-// if (simcall_execution_test(pimpl_)) {
-// state_ = State::FINISHED;
-// return true;
-// }
-//
-// return false;
-//}
+Activity* Io::wait()
+{
+ simcall_io_wait(pimpl_);
+ state_ = State::FINISHED;
+ return this;
+}
+
+Activity* Io::wait(double timeout)
+{
+ THROW_UNIMPLEMENTED;
+ return this;
+}
/** @brief Returns the amount of flops that remain to be done */
double Io::get_remaining()
{
return simgrid::simix::simcall(
- [this]() { return boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
+ [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_remaining(); });
}
-// double Io::get_remaining_ratio()
-//{
-// return simgrid::simix::simcall([this]() {
-// return boost::static_pointer_cast<simgrid::kernel::activity::IoImpl>(pimpl_)->get_remaining_ratio();
-// });
-//}
+sg_size_t Io::get_performed_ioops()
+{
+ return simgrid::simix::simcall(
+ [this]() { return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops(); });
+}
-void intrusive_ptr_release(simgrid::s4u::Io* e)
+void intrusive_ptr_release(simgrid::s4u::Io* i)
{
- if (e->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
+ if (i->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
std::atomic_thread_fence(std::memory_order_acquire);
- delete e;
+ delete i;
}
}
-void intrusive_ptr_add_ref(simgrid::s4u::Io* e)
+void intrusive_ptr_add_ref(simgrid::s4u::Io* i)
{
- e->refcount_.fetch_add(1, std::memory_order_relaxed);
+ i->refcount_.fetch_add(1, std::memory_order_relaxed);
}
} // namespace s4u
} // namespace simgrid