Avoid using surf_network_model global

[simgrid.git] / src / surf / disk_s19.hpp

diff --git a/src/surf/disk_s19.hpp b/src/surf/disk_s19.hpp
index a46ffce68928f95842c63cff57bbee95099cbb54..feea129d5648bf8bc0889ef2a2d95c20bc33df8b 100644 (file)
--- a/src/surf/disk_s19.hpp
+++ b/src/surf/disk_s19.hpp
@@ -29,7 +29,7 @@ class XBT_PRIVATE DiskS19Action;
 class DiskS19Model : public DiskModel {
 public:
   DiskS19Model();
-  DiskImpl* createDisk(const std::string& id, double read_bw, double write_bw) override;
+  DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) override;
   double next_occurring_event(double now) override;
   void update_actions_state(double now, double delta) override;
 };
@@ -40,8 +40,7 @@ public:
 
 class DiskS19 : public DiskImpl {
 public:
-  DiskS19(DiskModel* model, const std::string& name, kernel::lmm::System* maxminSystem, double read_bw,
-          double write_bw);
+  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;