this belongs to the Impl not a specific model

diff --git a/src/kernel/resource/DiskImpl.cpp b/src/kernel/resource/DiskImpl.cpp
index 126d53f..8e20838 100644 (file)
--- a/src/kernel/resource/DiskImpl.cpp
+++ b/src/kernel/resource/DiskImpl.cpp
@@ -117,6 +117,29 @@ constexpr kernel::lmm::Constraint::SharingPolicy to_maxmin_policy(s4u::Disk::Sha
   return lmm_policy;
 }
 
+void DiskImpl::set_read_bandwidth(double value)
+{
+  read_bw_.peak = value;
+  if (constraint_read_)
+    get_model()->get_maxmin_system()->update_constraint_bound(constraint_read_, read_bw_.peak * read_bw_.scale);
+}
+
+void DiskImpl::set_write_bandwidth(double value)
+{
+  write_bw_.peak = value;
+  if (constraint_write_) {
+    get_model()->get_maxmin_system()->update_constraint_bound(constraint_write_, write_bw_.peak* write_bw_.scale);
+  }
+}
+
+void DiskImpl::set_readwrite_bandwidth(double value)
+{
+   readwrite_bw_ = value;
+   if (get_constraint()) {
+    get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), readwrite_bw_);
+  }
+}
+
 void DiskImpl::set_sharing_policy(s4u::Disk::Operation op, s4u::Disk::SharingPolicy policy,
                                   const s4u::NonLinearResourceCb& cb)
 {

diff --git a/src/kernel/resource/DiskImpl.hpp b/src/kernel/resource/DiskImpl.hpp
index 7b46f08..1260d4b 100644 (file)
--- a/src/kernel/resource/DiskImpl.hpp
+++ b/src/kernel/resource/DiskImpl.hpp
@@ -72,13 +72,13 @@ public:
   DiskImpl* set_host(s4u::Host* host);
   s4u::Host* get_host() const { return host_; }
 
-  virtual void set_read_bandwidth(double value) { read_bw_.peak = value; }
+  void set_read_bandwidth(double value);
   double get_read_bandwidth() const { return read_bw_.peak * read_bw_.scale; }
 
-  virtual void set_write_bandwidth(double value) { write_bw_.peak = value; }
+  void set_write_bandwidth(double value);
   double get_write_bandwidth() const { return write_bw_.peak * write_bw_.scale; }
 
-  virtual void set_readwrite_bandwidth(double value) { readwrite_bw_ = value; }
+  void set_readwrite_bandwidth(double value);
   double get_readwrite_bandwidth() const { return readwrite_bw_; }
 
   DiskImpl* set_read_constraint(lmm::Constraint* constraint_read);

diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp
index 8299b4b..d376ba2 100644 (file)
--- a/src/surf/disk_s19.cpp
+++ b/src/surf/disk_s19.cpp
@@ -65,52 +65,9 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta)
   }
 }
 
-DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type)
-{
-  auto* action = new DiskS19Action(get_model(), static_cast<double>(size), not is_on());
-  get_model()->get_maxmin_system()->expand(get_constraint(), action->get_variable(), 1.0);
-  switch (type) {
-    case s4u::Io::OpType::READ:
-      get_model()->get_maxmin_system()->expand(get_read_constraint(), action->get_variable(), 1.0);
-      break;
-    case s4u::Io::OpType::WRITE:
-      get_model()->get_maxmin_system()->expand(get_write_constraint(), action->get_variable(), 1.0);
-      break;
-    default:
-      THROW_UNIMPLEMENTED;
-  }
-  if (const auto& factor_cb = get_factor_cb()) { // handling disk variability
-    action->set_rate_factor(factor_cb(size, type));
-  }
-  return action;
-}
-
 /************
  * Resource *
  ************/
-void DiskS19::set_read_bandwidth(double value)
-{
-  DiskImpl::set_read_bandwidth(value);
-  if (get_read_constraint()) {
-    get_model()->get_maxmin_system()->update_constraint_bound(get_read_constraint(), get_read_bandwidth());
-  }
-}
-
-void DiskS19::set_write_bandwidth(double value)
-{
-  DiskImpl::set_write_bandwidth(value);
-  if (get_write_constraint()) {
-    get_model()->get_maxmin_system()->update_constraint_bound(get_write_constraint(), get_write_bandwidth());
-  }
-}
-
-void DiskS19::set_readwrite_bandwidth(double value)
-{
-  DiskImpl::set_readwrite_bandwidth(value);
-  if (get_constraint()) {
-    get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), get_readwrite_bandwidth());
-  }
-}
 
 void DiskS19::apply_event(kernel::profile::Event* triggered, double value)
 {
@@ -144,4 +101,24 @@ DiskS19Action::DiskS19Action(Model* model, double cost, bool failed)
 {
 }
 
+DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type)
+{
+  auto* action = new DiskS19Action(get_model(), static_cast<double>(size), not is_on());
+  get_model()->get_maxmin_system()->expand(get_constraint(), action->get_variable(), 1.0);
+  switch (type) {
+    case s4u::Io::OpType::READ:
+      get_model()->get_maxmin_system()->expand(get_read_constraint(), action->get_variable(), 1.0);
+      break;
+    case s4u::Io::OpType::WRITE:
+      get_model()->get_maxmin_system()->expand(get_write_constraint(), action->get_variable(), 1.0);
+      break;
+    default:
+      THROW_UNIMPLEMENTED;
+  }
+  if (const auto& factor_cb = get_factor_cb()) { // handling disk variability
+    action->set_rate_factor(factor_cb(size, type));
+  }
+  return action;
+}
+
 } // namespace simgrid::kernel::resource

diff --git a/src/surf/disk_s19.hpp b/src/surf/disk_s19.hpp
index b4c352b..bc15f92 100644 (file)
--- a/src/surf/disk_s19.hpp
+++ b/src/surf/disk_s19.hpp
@@ -41,9 +41,6 @@ public:
 class DiskS19 : public DiskImpl {
 public:
   using DiskImpl::DiskImpl;
-  void set_read_bandwidth(double value) override;
-  void set_write_bandwidth(double value) override;
-  void set_readwrite_bandwidth(double value) override;
   void apply_event(kernel::profile::Event* triggered, double value) override;
   DiskAction* io_start(sg_size_t size, s4u::Io::OpType type) override;
 };