X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/75e8b2ae65722d849ef899616de7091286ec91f5..044695be6d7979484f492d3640dd30fb6bcac2dc:/src/kernel/resource/DiskImpl.hpp

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index bc1a65fec4..8f7af7b5d8 100644
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-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. */
@@ -20,8 +20,6 @@
  * Model *
  *********/
 
-XBT_PUBLIC_DATA simgrid::kernel::resource::DiskModel* surf_disk_model;
-
 namespace simgrid {
 namespace kernel {
 namespace resource {
@@ -34,56 +32,67 @@ class DiskAction;
 /*********
  * Model *
  *********/
-class DiskModel : public kernel::resource::Model {
+class DiskModel : public Model {
 public:
   DiskModel();
   DiskModel(const DiskModel&) = delete;
   DiskModel& operator=(const DiskModel&) = delete;
-  ~DiskModel();
+  ~DiskModel() = default;
 
-  virtual DiskImpl* createDisk(const std::string& id, double read_bw, double write_bw) = 0;
+  virtual DiskImpl* create_disk(const std::string& name, double read_bandwidth, double write_bandwidth) = 0;
 };
 
 /************
  * Resource *
  ************/
-class DiskImpl : public Resource, public xbt::PropertyHolder {
-  bool currently_destroying_ = false;
+class DiskImpl : public Resource_T<DiskImpl>, public xbt::PropertyHolder {
   s4u::Host* host_           = nullptr;
   s4u::Disk piface_;
-  double read_bw_;
-  double write_bw_;
+  double read_bw_ = -1.0;
+  double write_bw_ = 1.0;
+  lmm::Constraint* constraint_write_ = nullptr; /* Constraint for maximum write bandwidth*/
+  lmm::Constraint* constraint_read_ = nullptr;  /* Constraint for maximum read bandwidth*/
+
+protected:
+  ~DiskImpl() override = default; // Disallow direct deletion. Call destroy() instead.
 
 public:
-  DiskImpl(Model* model, const std::string& name, kernel::lmm::System* maxmin_system, double read_bw, double bwrite_bw);
+  DiskImpl(const std::string& name, double read_bandwidth, double write_bandwidth)
+      : Resource_T(name), piface_(name, this), read_bw_(read_bandwidth), write_bw_(write_bandwidth)
+  {
+  }
   DiskImpl(const DiskImpl&) = delete;
   DiskImpl& operator=(const DiskImpl&) = delete;
 
-  ~DiskImpl() override;
-
   /** @brief Public interface */
+  const s4u::Disk* get_iface() const { return &piface_; }
   s4u::Disk* get_iface() { return &piface_; }
-  double get_read_bandwidth() { return read_bw_; }
-  double get_write_bandwidth() { return write_bw_; }
+  DiskImpl* set_host(s4u::Host* host);
+  s4u::Host* get_host() const { return host_; }
 
-  /** @brief Check if the Storage is used (if an action currently uses its resources) */
-  bool is_used() override;
+  DiskImpl* set_read_bandwidth(double read_bw);
+  double get_read_bandwidth() const { return read_bw_; }
 
-  void apply_event(profile::Event* event, double value) override;
+  DiskImpl* set_write_bandwidth(double write_bw);
+  double get_write_bandwidth() const { return write_bw_; }
+
+  DiskImpl* set_read_constraint(lmm::Constraint* constraint_read);
+  lmm::Constraint* get_read_constraint() const { return constraint_read_; }
 
+  DiskImpl* set_write_constraint(lmm::Constraint* constraint_write);
+  lmm::Constraint* get_write_constraint() const { return constraint_write_; }
+
+  /** @brief Check if the Disk is used (if an action currently uses its resources) */
+  bool is_used() const override;
+  void apply_event(profile::Event* event, double value) override;
   void turn_on() override;
   void turn_off() override;
 
-  s4u::Host* get_host() const { return host_; }
-  void set_host(s4u::Host* host) { host_ = host; }
-
+  void seal() override;
   void destroy(); // Must be called instead of the destructor
   virtual DiskAction* io_start(sg_size_t size, s4u::Io::OpType type) = 0;
   virtual DiskAction* read(sg_size_t size)                           = 0;
   virtual DiskAction* write(sg_size_t size)                          = 0;
-
-  lmm::Constraint* constraint_write_; /* Constraint for maximum write bandwidth*/
-  lmm::Constraint* constraint_read_;  /* Constraint for maximum write bandwidth*/
 };
 
 /**********
@@ -100,11 +109,11 @@ public:
   /**
    * @brief diskAction constructor
    *
-   * @param model The StorageModel associated to this DiskAction
+   * @param model The DiskModel associated to this DiskAction
    * @param cost The cost of this DiskAction in bytes
    * @param failed [description]
    * @param var The lmm variable associated to this DiskAction if it is part of a LMM component
-   * @param storage The Storage associated to this DiskAction
+   * @param disk The Disk associated to this DiskAction
    * @param type [description]
    */
   DiskAction(kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var, DiskImpl* disk,