Merge network/bandwidth-factor and smpi/bw-factor (and same for latency)

[simgrid.git] / src / kernel / resource / DiskImpl.hpp

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index c7835b6..611234d 100644 (file)
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -1,28 +1,26 @@
-/* Copyright (c) 2019-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2019-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. */
 
 #include "simgrid/kernel/resource/Action.hpp"
 #include "simgrid/kernel/resource/Model.hpp"
-#include "simgrid/kernel/resource/Resource.hpp"
 #include "simgrid/s4u/Disk.hpp"
 #include "simgrid/s4u/Io.hpp"
+#include "src/kernel/resource/Resource.hpp"
 #include "src/surf/surf_interface.hpp"
-#include <xbt/PropertyHolder.hpp>
+#include "xbt/PropertyHolder.hpp"
 
 #include <map>
 
-#ifndef DISK_INTERFACE_HPP_
-#define DISK_INTERFACE_HPP_
+#ifndef DISK_IMPL_HPP_
+#define DISK_IMPL_HPP_
 
 /*********
  * Model *
  *********/
 
-namespace simgrid {
-namespace kernel {
-namespace resource {
+namespace simgrid::kernel::resource {
 /***********
  * Classes *
  ***********/
@@ -56,6 +54,11 @@ class DiskImpl : public Resource_T<DiskImpl>, public xbt::PropertyHolder {
       {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_                                       = {};
+
+  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) */
 
   void apply_sharing_policy_cfg();
 
@@ -63,9 +66,6 @@ protected:
   ~DiskImpl() override = default; // Disallow direct deletion. Call destroy() instead.
 
 public:
-  Metric read_bw_  = {0.0, 0, nullptr};
-  Metric write_bw_ = {0.0, 0, nullptr};
-
   explicit DiskImpl(const std::string& name, double read_bandwidth, double write_bandwidth);
   DiskImpl(const DiskImpl&) = delete;
   DiskImpl& operator=(const DiskImpl&) = delete;
@@ -76,26 +76,36 @@ public:
   DiskImpl* set_host(s4u::Host* host);
   s4u::Host* get_host() const { return host_; }
 
-  virtual void set_read_bandwidth(double read_bw) = 0;
+  virtual void set_read_bandwidth(double value) { read_bw_.peak = value; }
   double get_read_bandwidth() const { return read_bw_.peak * read_bw_.scale; }
 
-  virtual void set_write_bandwidth(double write_bw) = 0;
+  virtual void set_write_bandwidth(double value) { write_bw_.peak = value; }
   double get_write_bandwidth() const { return write_bw_.peak * write_bw_.scale; }
 
+  virtual void set_readwrite_bandwidth(double value) { readwrite_bw_ = value; }
+  double get_readwrite_bandwidth() const { return readwrite_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_; }
 
+  profile::Event* get_read_event() const { return read_bw_.event; }
+  void unref_read_event() { tmgr_trace_event_unref(&read_bw_.event); }
+
+  profile::Event* get_write_event() const { return write_bw_.event; }
+  void unref_write_event() { tmgr_trace_event_unref(&write_bw_.event); }
+
   DiskImpl* set_read_bandwidth_profile(profile::Profile* profile);
   DiskImpl* set_write_bandwidth_profile(profile::Profile* profile);
 
   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;
 
-  /** @brief Check if the Disk is used (if an action currently uses its resources) */
-  bool is_used() const override;
+  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;
 
@@ -113,11 +123,7 @@ public:
 
   using Action::Action;
   void set_state(simgrid::kernel::resource::Action::State state) override;
-
-  double sharing_penalty_ = {};
 };
 
-} // namespace resource
-} // namespace kernel
-} // namespace simgrid
-#endif /* DISK_INTERFACE_HPP_ */
+} // namespace simgrid::kernel::resource
+#endif /* DISK_IMPL_HPP_ */