X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5d70f95ee9e74e70bbf4932bef39ae76fb592fbd..3807f6651be774322f7175035aabe89aa92fb058:/src/surf/disk_s19.hpp

diff --git a/src/surf/disk_s19.hpp b/src/surf/disk_s19.hpp
index 63ae718241..35a043a7bc 100644
--- a/src/surf/disk_s19.hpp
+++ b/src/surf/disk_s19.hpp
@@ -28,9 +28,11 @@ class XBT_PRIVATE DiskS19Action;
 
 class DiskS19Model : public DiskModel {
 public:
-  DiskS19Model() = default;
+  using DiskModel::DiskModel;
   DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) override;
-  double next_occurring_event(double now) override;
+
+  DiskAction* io_start(const DiskImpl* disk, sg_size_t size, s4u::Io::OpType type) override;
+
   void update_actions_state(double now, double delta) override;
 };
 
@@ -40,10 +42,7 @@ public:
 
 class DiskS19 : public DiskImpl {
 public:
-  explicit DiskS19(const std::string& name, double read_bw, double write_bw): DiskImpl(name, read_bw, write_bw) {}
-  DiskAction* io_start(sg_size_t size, s4u::Io::OpType type) override;
-  DiskAction* read(sg_size_t size) override;
-  DiskAction* write(sg_size_t size) override;
+  using DiskImpl::DiskImpl;
 };
 
 /**********
@@ -52,12 +51,7 @@ public:
 
 class DiskS19Action : public DiskAction {
 public:
-  DiskS19Action(Model* model, double cost, bool failed, DiskImpl* disk, s4u::Io::OpType type);
-  void suspend() override;
-  void cancel() override;
-  void resume() override;
-  void set_max_duration(double duration) override;
-  void set_sharing_penalty(double sharing_penalty) override;
+  DiskS19Action(Model* model, double cost, bool failed);
   void update_remains_lazy(double now) override;
 };