try to match Activity design to Resource design

[simgrid.git] / src / s4u / s4u_Io.cpp

diff --git a/src/s4u/s4u_Io.cpp b/src/s4u/s4u_Io.cpp
index aec4f16..082d00b 100644 (file)
--- a/src/s4u/s4u_Io.cpp
+++ b/src/s4u/s4u_Io.cpp
@@ -27,14 +27,8 @@ IoPtr Io::init()
 
 Io* Io::start()
 {
-  kernel::actor::simcall([this] {
-    (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_))
-                  .set_name(get_name())
-                  .set_disk(disk_->get_impl())
-                  .set_size(size_)
-                  .set_type(type_)
-                  .start();
-  });
+  kernel::actor::simcall(
+      [this] { (*boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)).set_name(get_name()).start(); });
 
   if (suspended_)
     pimpl_->suspend();
@@ -46,7 +40,7 @@ Io* Io::start()
 
 Io* Io::cancel()
 {
-  simgrid::kernel::actor::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
+  kernel::actor::simcall([this] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->cancel(); });
   state_ = State::CANCELED;
   on_completion(*this);
   return this;
@@ -73,7 +67,10 @@ Io* Io::wait_for(double timeout)
 
 IoPtr Io::set_disk(sg_disk_t disk)
 {
-  disk_ = disk;
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set disk once the Io is started");
+
+  kernel::actor::simcall(
+      [this, disk] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_disk(disk->get_impl()); });
 
   // Setting the disk may allow to start the activity, let's try
   if (state_ == State::STARTING)
@@ -84,14 +81,18 @@ IoPtr Io::set_disk(sg_disk_t disk)
 
 IoPtr Io::set_size(sg_size_t size)
 {
-  size_ = size;
-  Activity::set_remaining(size_);
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
+  kernel::actor::simcall(
+      [this, size] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_size(size); });
+  Activity::set_remaining(size);
   return this;
 }
 
 IoPtr Io::set_op_type(OpType type)
 {
-  type_ = type;
+  xbt_assert(state_ == State::INITED || state_ == State::STARTING, "Cannot set size once the Io is started");
+  kernel::actor::simcall(
+      [this, type] { boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->set_type(type); });
   return this;
 }
 
@@ -107,5 +108,10 @@ sg_size_t Io::get_performed_ioops() const
   return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_performed_ioops();
 }
 
+bool Io::is_assigned() const
+{
+  return boost::static_pointer_cast<kernel::activity::IoImpl>(pimpl_)->get_disk() != nullptr;
+}
+
 } // namespace s4u
 } // namespace simgrid