make test pass. The finalization barrier is needed in this case, which is suboptimal.

[simgrid.git] / src / surf / disk_s19.cpp

diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp
index 6c2e68a..c1edbda 100644 (file)
--- a/src/surf/disk_s19.cpp
+++ b/src/surf/disk_s19.cpp
@@ -23,8 +23,9 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk);
 void surf_disk_model_init_default()
 {
   auto disk_model = std::make_shared<simgrid::kernel::resource::DiskS19Model>("Disk");
-  simgrid::kernel::EngineImpl::get_instance()->add_model(disk_model);
-  simgrid::s4u::Engine::get_instance()->get_netzone_root()->get_impl()->set_disk_model(disk_model);
+  auto* engine    = simgrid::kernel::EngineImpl::get_instance();
+  engine->add_model(disk_model);
+  engine->get_netzone_root()->set_disk_model(disk_model);
 }
 
 namespace simgrid {
@@ -65,50 +66,40 @@ DiskAction* DiskS19Model::io_start(const DiskImpl* disk, sg_size_t size, s4u::Io
     default:
       THROW_UNIMPLEMENTED;
   }
+  const auto& factor_cb = disk->get_factor_cb();
+  if (factor_cb) { // handling disk variability
+    action->set_rate_factor(factor_cb(size, type));
+  }
   return action;
 }
 
 /************
  * Resource *
  ************/
-void DiskS19::update_penalties(double delta) const
-{
-  const kernel::lmm::Element* elem     = nullptr;
-  const kernel::lmm::Element* nextelem = nullptr;
-  size_t numelem                       = 0;
-  while (const auto* var = get_constraint()->get_variable_safe(&elem, &nextelem, &numelem)) {
-    auto* action = static_cast<DiskS19Action*>(var->get_id());
-    action->sharing_penalty_ += delta;
-    if (not action->is_suspended())
-      get_model()->get_maxmin_system()->update_variable_penalty(action->get_variable(), action->sharing_penalty_);
-  }
-}
-
 void DiskS19::set_read_bandwidth(double value)
 {
   read_bw_.peak = value;
 
-  get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), read_bw_.peak * read_bw_.scale);
-
-  double delta = 1.0 / value - 1.0 / (read_bw_.peak * read_bw_.scale);
-  update_penalties(delta);
+  if (get_read_constraint()) {
+    get_model()->get_maxmin_system()->update_constraint_bound(get_read_constraint(), read_bw_.peak * read_bw_.scale);
+  }
 }
 
 void DiskS19::set_write_bandwidth(double value)
 {
   write_bw_.peak = value;
 
-  get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), write_bw_.peak * write_bw_.scale);
-
-  double delta = 1.0 / value - 1.0 / (write_bw_.peak * write_bw_.scale);
-  update_penalties(delta);
+  if (get_write_constraint()) {
+    get_model()->get_maxmin_system()->update_constraint_bound(get_write_constraint(), write_bw_.peak * write_bw_.scale);
+  }
 }
 
 void DiskS19::set_readwrite_bandwidth(double value)
 {
   readwrite_bw_ = value;
-  if (get_constraint())
+  if (get_constraint()) {
     get_model()->get_maxmin_system()->update_constraint_bound(get_constraint(), readwrite_bw_);
+  }
 }
 
 void DiskS19::apply_event(kernel::profile::Event* triggered, double value)