Factor Activity::wait() and wait_for() through CRTP.

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

diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp
index 937e537..f8f10f8 100644 (file)
--- a/src/s4u/s4u_Disk.cpp
+++ b/src/s4u/s4u_Disk.cpp
@@ -28,19 +28,19 @@ Disk* Disk::set_name(const std::string& name)
 
 Disk* Disk::set_read_bandwidth(double read_bw)
 {
-  pimpl_->set_read_bandwidth(read_bw);
+  kernel::actor::simcall([this, read_bw] { pimpl_->set_read_bandwidth(read_bw); });
   return this;
 }
 
 Disk* Disk::set_write_bandwidth(double write_bw)
 {
-  pimpl_->set_write_bandwidth(write_bw);
+  kernel::actor::simcall([this, write_bw] { pimpl_->set_write_bandwidth(write_bw); });
   return this;
 }
 
 double Disk::get_read_bandwidth() const
 {
-  return this->pimpl_->get_read_bandwidth();
+  return pimpl_->get_read_bandwidth();
 }
 
 double Disk::get_write_bandwidth() const
@@ -48,6 +48,12 @@ double Disk::get_write_bandwidth() const
   return pimpl_->get_write_bandwidth();
 }
 
+Disk* Disk::set_host(Host* host)
+{
+  pimpl_->set_host(host);
+  return this;
+}
+
 Host* Disk::get_host() const
 {
   return pimpl_->get_host();
@@ -60,39 +66,52 @@ const std::unordered_map<std::string, std::string>* Disk::get_properties() const
 
 const char* Disk::get_property(const std::string& key) const
 {
-  return this->pimpl_->get_property(key);
+  return pimpl_->get_property(key);
 }
 
-void Disk::set_property(const std::string& key, const std::string& value)
+Disk* Disk::set_property(const std::string& key, const std::string& value)
 {
   kernel::actor::simcall([this, &key, &value] { this->pimpl_->set_property(key, value); });
+  return this;
+}
+
+Disk* Disk::set_properties(const std::unordered_map<std::string, std::string>& properties)
+{
+  kernel::actor::simcall([this, properties] { this->pimpl_->set_properties(properties); });
+  return this;
 }
 
-IoPtr Disk::io_init(sg_size_t size, Io::OpType type)
+IoPtr Disk::io_init(sg_size_t size, Io::OpType type) const
 {
   return Io::init()->set_disk(this)->set_size(size)->set_op_type(type);
 }
 
-IoPtr Disk::read_async(sg_size_t size)
+IoPtr Disk::read_async(sg_size_t size) const
 {
   return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start();
 }
 
-sg_size_t Disk::read(sg_size_t size)
+sg_size_t Disk::read(sg_size_t size) const
 {
   return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start()->wait()->get_performed_ioops();
 }
 
-IoPtr Disk::write_async(sg_size_t size)
+IoPtr Disk::write_async(sg_size_t size) const
 {
   return IoPtr(io_init(size, Io::OpType::WRITE)->vetoable_start());
 }
 
-sg_size_t Disk::write(sg_size_t size)
+sg_size_t Disk::write(sg_size_t size) const
 {
   return IoPtr(io_init(size, Io::OpType::WRITE))->vetoable_start()->wait()->get_performed_ioops();
 }
 
+Disk* Disk::seal()
+{
+  kernel::actor::simcall([this]{ pimpl_->seal(); });
+  Disk::on_creation(*this);
+  return this;
+}
 } // namespace s4u
 } // namespace simgrid
 
@@ -118,11 +137,11 @@ double sg_disk_write_bandwidth(const_sg_disk_t disk)
   return disk->get_write_bandwidth();
 }
 
-sg_size_t sg_disk_read(sg_disk_t disk, sg_size_t size)
+sg_size_t sg_disk_read(const_sg_disk_t disk, sg_size_t size)
 {
   return disk->read(size);
 }
-sg_size_t sg_disk_write(sg_disk_t disk, sg_size_t size)
+sg_size_t sg_disk_write(const_sg_disk_t disk, sg_size_t size)
 {
   return disk->write(size);
 }