Merge branch 'master' of framagit.org:simgrid/simgrid

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

diff --git a/src/s4u/s4u_Disk.cpp b/src/s4u/s4u_Disk.cpp
index f79b6d0..e955497 100644 (file)
--- a/src/s4u/s4u_Disk.cpp
+++ b/src/s4u/s4u_Disk.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -20,6 +20,24 @@ xbt::signal<void(Disk&)> Disk::on_creation;
 xbt::signal<void(Disk const&)> Disk::on_destruction;
 xbt::signal<void(Disk const&)> Disk::on_state_change;
 
+Disk* Disk::set_name(const std::string& name)
+{
+  name_ = name;
+  return this;
+}
+
+Disk* Disk::set_read_bandwidth(double read_bw)
+{
+  pimpl_->set_read_bandwidth(read_bw);
+  return this;
+}
+
+Disk* Disk::set_write_bandwidth(double write_bw)
+{
+  pimpl_->set_write_bandwidth(write_bw);
+  return this;
+}
+
 double Disk::get_read_bandwidth() const
 {
   return this->pimpl_->get_read_bandwidth();
@@ -30,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();
@@ -52,29 +76,35 @@ void Disk::set_property(const std::string& key, const std::string& value)
 
 IoPtr Disk::io_init(sg_size_t size, Io::OpType type)
 {
-  return IoPtr(new Io(this, size, type));
+  return Io::init()->set_disk(this)->set_size(size)->set_op_type(type);
 }
 
 IoPtr Disk::read_async(sg_size_t size)
 {
-  return IoPtr(io_init(size, Io::OpType::READ))->start();
+  return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start();
 }
 
 sg_size_t Disk::read(sg_size_t size)
 {
-  return IoPtr(io_init(size, Io::OpType::READ))->start()->wait()->get_performed_ioops();
+  return IoPtr(io_init(size, Io::OpType::READ))->vetoable_start()->wait()->get_performed_ioops();
 }
 
 IoPtr Disk::write_async(sg_size_t size)
 {
-  return IoPtr(io_init(size, Io::OpType::WRITE)->start());
+  return IoPtr(io_init(size, Io::OpType::WRITE)->vetoable_start());
 }
 
 sg_size_t Disk::write(sg_size_t size)
 {
-  return IoPtr(io_init(size, Io::OpType::WRITE))->start()->wait()->get_performed_ioops();
+  return IoPtr(io_init(size, Io::OpType::WRITE))->vetoable_start()->wait()->get_performed_ioops();
 }
 
+void Disk::seal()
+{
+  kernel::actor::simcall([this]{ pimpl_->seal(); });
+  get_host()->add_disk(this);
+  Disk::on_creation(*this);
+}
 } // namespace s4u
 } // namespace simgrid
 
@@ -85,11 +115,6 @@ const char* sg_disk_get_name(const_sg_disk_t disk)
   return disk->get_cname();
 }
 
-const char* sg_disk_name(const_sg_disk_t disk) // XBT_ATTRIB_DEPRECATED_v330
-{
-  return sg_disk_get_name(disk);
-}
-
 sg_host_t sg_disk_get_host(const_sg_disk_t disk)
 {
   return disk->get_host();
@@ -123,13 +148,3 @@ void sg_disk_set_data(sg_disk_t disk, void* data)
 {
   disk->set_data(data);
 }
-
-void* sg_disk_data(const_sg_disk_t disk) // XBT_ATTRIB_DEPRECATED_v330
-{
-  return sg_disk_get_data(disk);
-}
-
-void sg_disk_data_set(sg_disk_t disk, void* data) // XBT_ATTRIB_DEPRECATED_v330
-{
-  sg_disk_set_data(disk, data);
-}