X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2ecde6af20db46907714e04cee35408df5f5a10..7672ae43c2b49a7dcdc0976cc89a05cc87ae534c:/src/surf/disk_s19.hpp

diff --git a/src/surf/disk_s19.hpp b/src/surf/disk_s19.hpp
index f169c4810d..b4c352bee3 100644
--- a/src/surf/disk_s19.hpp
+++ b/src/surf/disk_s19.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2022. 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. */
@@ -10,9 +10,7 @@
 #ifndef DISK_S19_HPP_
 #define DISK_S19_HPP_
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 
 /***********
  * Classes *
@@ -28,11 +26,11 @@ class XBT_PRIVATE DiskS19Action;
 
 class DiskS19Model : public DiskModel {
 public:
-  using DiskModel::DiskModel;
+  explicit DiskS19Model(const std::string& name);
+  DiskS19Model(const DiskS19Model&) = delete;
+  DiskS19Model& operator=(const DiskS19Model&) = delete;
   DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) 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;
 };
 
@@ -41,14 +39,13 @@ public:
  ************/
 
 class DiskS19 : public DiskImpl {
-  void update_penalties(double delta) const;
-
 public:
   using DiskImpl::DiskImpl;
   void set_read_bandwidth(double value) override;
   void set_write_bandwidth(double value) override;
   void set_readwrite_bandwidth(double value) override;
   void apply_event(kernel::profile::Event* triggered, double value) override;
+  DiskAction* io_start(sg_size_t size, s4u::Io::OpType type) override;
 };
 
 /**********
@@ -58,10 +55,7 @@ public:
 class DiskS19Action : public DiskAction {
 public:
   DiskS19Action(Model* model, double cost, bool failed);
-  void update_remains_lazy(double now) override;
 };
 
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
+} // namespace simgrid::kernel::resource
 #endif /* DISK_S19_HPP_ */