easier to store and use DiskImpl at kernel level

diff --git a/src/surf/HostImpl.hpp b/src/surf/HostImpl.hpp
index 2ba5ad2..e2533b2 100644 (file)
--- a/src/surf/HostImpl.hpp
+++ b/src/surf/HostImpl.hpp
@@ -29,7 +29,7 @@ public:
 
   virtual Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                                    const double* bytes_amount, double rate) = 0;
-  virtual Action* io_stream(s4u::Host* src_host, s4u::Disk* src_disk, s4u::Host* dst_host, s4u::Disk* dst_disk, double size) = 0;
+  virtual Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size) = 0;
 };
 
 /************

diff --git a/src/surf/host_clm03.hpp b/src/surf/host_clm03.hpp
index 991c45a..9e073b5 100644 (file)
--- a/src/surf/host_clm03.hpp
+++ b/src/surf/host_clm03.hpp
@@ -22,7 +22,7 @@ public:
   Action* execute_thread(const s4u::Host* host, double flops_amount, int thread_count) override;
   Action* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                            const double* bytes_amount, double rate) override;
-  Action* io_stream(s4u::Host* src_host, s4u::Disk* src_disk, s4u::Host* dst_host, s4u::Disk* dst_disk, double size) override { return nullptr; }
+  Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size) override { return nullptr; }
 };
 } // namespace simgrid::kernel::resource
 

diff --git a/src/surf/ptask_L07.hpp b/src/surf/ptask_L07.hpp
index 5bcbc25..c48d999 100644 (file)
--- a/src/surf/ptask_L07.hpp
+++ b/src/surf/ptask_L07.hpp
@@ -41,7 +41,7 @@ public:
   Action* execute_thread(const s4u::Host* host, double flops_amount, int thread_count) override { return nullptr; }
   CpuAction* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                               const double* bytes_amount, double rate) override;
-  Action* io_stream(s4u::Host* src_host, s4u::Disk* src_disk, s4u::Host* dst_host, s4u::Disk* dst_disk, double size) override { return nullptr; }
+  Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size) override { return nullptr; }
 };
 
 class CpuL07Model : public CpuModel {

diff --git a/src/surf/sio_S22.cpp b/src/surf/sio_S22.cpp
index b8439bc..85ee1a3 100644 (file)
--- a/src/surf/sio_S22.cpp
+++ b/src/surf/sio_S22.cpp
@@ -152,7 +152,7 @@ void HostS22Model::update_actions_state(double /*now*/, double delta)
   }
 }
 
-S22Action::S22Action(Model* model, s4u::Host* src_host, s4u::Disk* src_disk, s4u::Host* dst_host, s4u::Disk* dst_disk, double size)
+S22Action::S22Action(Model* model, s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size)
     : DiskAction(model, 1.0, false)
     , src_host_(src_host)
     , src_disk_(src_disk)
@@ -194,9 +194,9 @@ S22Action::S22Action(Model* model, s4u::Host* src_host, s4u::Disk* src_disk, s4u
   /* Expand it for the disks even if there is nothing to read/write, to make sure that it gets expended even if there is no
    * communication either */
   if (src_disk_ != nullptr)
-    model->get_maxmin_system()->expand(src_disk_->get_impl()->get_constraint(), get_variable(), size, true);
+    model->get_maxmin_system()->expand(src_disk_->get_constraint(), get_variable(), size, true);
   if (dst_disk_ != nullptr)
-    model->get_maxmin_system()->expand(dst_disk_->get_impl()->get_constraint(), get_variable(), size, true);
+    model->get_maxmin_system()->expand(dst_disk_->get_constraint(), get_variable(), size, true);
 
   if (src_host_ != dst_host_) {
     std::vector<StandardLinkImpl*> route;
@@ -214,7 +214,7 @@ S22Action::S22Action(Model* model, s4u::Host* src_host, s4u::Disk* src_disk, s4u
   update_bound();
 }
 
-S22Action* HostS22Model::io_stream(s4u::Host* src_host, s4u::Disk* src_disk, s4u::Host* dst_host, s4u::Disk* dst_disk,
+S22Action* HostS22Model::io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk,
                                    double size)
 {
   return new S22Action(this, src_host, src_disk, dst_host, dst_disk, size);

diff --git a/src/surf/sio_S22.hpp b/src/surf/sio_S22.hpp
index e44fe52..2366fe5 100644 (file)
--- a/src/surf/sio_S22.hpp
+++ b/src/surf/sio_S22.hpp
@@ -40,7 +40,7 @@ public:
   Action* execute_thread(const s4u::Host* host, double flops_amount, int thread_count) override { return nullptr; }
   CpuAction* execute_parallel(const std::vector<s4u::Host*>& host_list, const double* flops_amount,
                               const double* bytes_amount, double rate) override { return nullptr; }
-  S22Action* io_stream(s4u::Host* src_host, s4u::Disk* src_disk, s4u::Host* dst_host, s4u::Disk* dst_disk, double size);
+  S22Action* io_stream(s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size);
 };
 
 class DiskS22Model : public DiskModel {
@@ -109,9 +109,9 @@ public:
  **********/
 class S22Action : public DiskAction {
   const s4u::Host* src_host_;
-  const s4u::Disk* src_disk_;
+  const DiskImpl* src_disk_;
   const s4u::Host* dst_host_;
-  const s4u::Disk* dst_disk_;
+  const DiskImpl* dst_disk_;
 
   const double size_;
 
@@ -134,7 +134,7 @@ class S22Action : public DiskAction {
 
 public:
   S22Action() = delete;
-  S22Action(Model* model, s4u::Host* src_host, s4u::Disk* src_disk, s4u::Host* dst_host, s4u::Disk* dst_disk, double size);
+  S22Action(Model* model, s4u::Host* src_host, DiskImpl* src_disk, s4u::Host* dst_host, DiskImpl* dst_disk, double size);
   S22Action(const S22Action&) = delete;
   S22Action& operator=(const S22Action&) = delete;
   ~S22Action() = default;