X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf6a962eb4e88efbed3df9c41343adabcf09e6c..10f12acec06b772d960500524bbbaf2d5d48c08b:/src/surf/disk_s19.hpp diff --git a/src/surf/disk_s19.hpp b/src/surf/disk_s19.hpp index 5b537ef58a..63ae718241 100644 --- a/src/surf/disk_s19.hpp +++ b/src/surf/disk_s19.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2013-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. */ @@ -28,9 +28,9 @@ class XBT_PRIVATE DiskS19Action; class DiskS19Model : public DiskModel { public: - DiskS19Model(); - DiskImpl* createDisk(const std::string& id, double read_bw, double write_bw) override; - double next_occuring_event(double now) override; + DiskS19Model() = default; + 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,9 +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); - virtual ~DiskS19() = default; + 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;