X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f7f97f7369be31efa83102c6718adb88ce2f9c01..fa4076fe495b91c58d1f6a3cdbbb3cb95b39a4bd:/src/kernel/resource/DiskImpl.hpp

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index 694972bc7d..5735d8dc8c 100644
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -51,6 +51,14 @@ class DiskImpl : public Resource_T<DiskImpl>, public xbt::PropertyHolder {
   s4u::Host* host_                   = nullptr;
   lmm::Constraint* constraint_write_ = nullptr; /* Constraint for maximum write bandwidth*/
   lmm::Constraint* constraint_read_  = nullptr; /* Constraint for maximum read bandwidth*/
+  std::unordered_map<s4u::Disk::Operation, s4u::Disk::SharingPolicy> sharing_policy_ = {
+      {s4u::Disk::Operation::READ, s4u::Disk::SharingPolicy::LINEAR},
+      {s4u::Disk::Operation::WRITE, s4u::Disk::SharingPolicy::LINEAR},
+      {s4u::Disk::Operation::READWRITE, s4u::Disk::SharingPolicy::LINEAR}};
+  std::unordered_map<s4u::Disk::Operation, s4u::NonLinearResourceCb> sharing_policy_cb_ = {};
+  std::function<s4u::Disk::IoFactorCb> factor_cb_                                       = {};
+
+  void apply_sharing_policy_cfg();
 
 protected:
   ~DiskImpl() override = default; // Disallow direct deletion. Call destroy() instead.
@@ -58,6 +66,7 @@ protected:
 public:
   Metric read_bw_  = {0.0, 0, nullptr};
   Metric write_bw_ = {0.0, 0, nullptr};
+  double readwrite_bw_ = -1; /* readwrite constraint bound, usually max(read, write) */
 
   explicit DiskImpl(const std::string& name, double read_bandwidth, double write_bandwidth);
   DiskImpl(const DiskImpl&) = delete;
@@ -75,6 +84,8 @@ public:
   virtual void set_write_bandwidth(double write_bw) = 0;
   double get_write_bandwidth() const { return write_bw_.peak * write_bw_.scale; }
 
+  virtual void set_readwrite_bandwidth(double bw) = 0;
+
   DiskImpl* set_read_constraint(lmm::Constraint* constraint_read);
   lmm::Constraint* get_read_constraint() const { return constraint_read_; }
 
@@ -84,8 +95,12 @@ public:
   DiskImpl* set_read_bandwidth_profile(profile::Profile* profile);
   DiskImpl* set_write_bandwidth_profile(profile::Profile* profile);
 
-  /** @brief Check if the Disk is used (if an action currently uses its resources) */
-  bool is_used() const override;
+  void set_sharing_policy(s4u::Disk::Operation op, s4u::Disk::SharingPolicy policy, const s4u::NonLinearResourceCb& cb);
+  s4u::Disk::SharingPolicy get_sharing_policy(s4u::Disk::Operation op) const;
+
+  void set_factor_cb(const std::function<s4u::Disk::IoFactorCb>& cb);
+  const std::function<s4u::Disk::IoFactorCb>& get_factor_cb() const { return factor_cb_; }
+
   void turn_on() override;
   void turn_off() override;
 
@@ -103,8 +118,6 @@ public:
 
   using Action::Action;
   void set_state(simgrid::kernel::resource::Action::State state) override;
-
-  double sharing_penalty_ = {};
 };
 
 } // namespace resource