CommWaitTransition mailbox is now valid

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

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index 80905f909e9935ca1ad1b2f5c2e611e83cb7e703..c9f732e3d10c6ac82b05030804f2f5791f4d7b79 100644 (file)
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -1,20 +1,20 @@
-/* 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 *
@@ -66,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;
@@ -83,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_; }
 
@@ -98,8 +101,6 @@ public:
   void set_factor_cb(const std::function<s4u::Disk::IoFactorCb>& cb);
   const std::function<s4u::Disk::IoFactorCb>& get_factor_cb() const { return factor_cb_; }
 
-  /** @brief Check if the Disk is used (if an action currently uses its resources) */
-  bool is_used() const override;
   void turn_on() override;
   void turn_off() override;
 
@@ -117,11 +118,9 @@ 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_ */
+#endif /* DISK_IMPL_HPP_ */