No more types for models.

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

diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp
index 4198e10..05b0b82 100644 (file)
--- a/src/surf/disk_s19.cpp
+++ b/src/surf/disk_s19.cpp
@@ -1,17 +1,19 @@
-/* Copyright (c) 2013-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2021. 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 "disk_s19.hpp"
 #include "simgrid/kernel/routing/NetPoint.hpp"
+#include "simgrid/kernel/routing/NetZoneImpl.hpp"
 #include "simgrid/s4u/Engine.hpp"
 #include "simgrid/s4u/Host.hpp"
+#include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/lmm/maxmin.hpp"
 #include "src/surf/xml/platf.hpp"
 #include "surf/surf.hpp"
 
-XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(disk_kernel);
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(res_disk);
 
 /*********
  * Model *
@@ -19,28 +21,24 @@ XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(disk_kernel);
 
 void surf_disk_model_init_default()
 {
-  surf_disk_model = new simgrid::kernel::resource::DiskS19Model();
+  auto disk_model = std::make_shared<simgrid::kernel::resource::DiskS19Model>();
+  disk_model->set_name("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);
 }
 
 namespace simgrid {
 namespace kernel {
 namespace resource {
 
-DiskS19Model::DiskS19Model()
+DiskImpl* DiskS19Model::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)
 {
-  all_existing_models.push_back(this);
+  return (new DiskS19(name, read_bandwidth, write_bandwidth))->set_model(this);
 }
 
-DiskImpl* DiskS19Model::createDisk(const std::string& id, double read_bw, double write_bw)
+double DiskS19Model::next_occurring_event(double now)
 {
-  XBT_DEBUG("SURF disk create resource\n\t\tid '%s'\n\t\tread_bw '%f'\n", id.c_str(), read_bw);
-
-  return new DiskS19(this, id, get_maxmin_system(), read_bw, write_bw);
-}
-
-double DiskS19Model::next_occuring_event(double now)
-{
-  return DiskModel::next_occuring_event_full(now);
+  return DiskModel::next_occurring_event_full(now);
 }
 
 void DiskS19Model::update_actions_state(double /*now*/, double delta)
@@ -48,7 +46,7 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta)
   for (auto it = std::begin(*get_started_action_set()); it != std::end(*get_started_action_set());) {
     auto& action = *it;
     ++it; // increment iterator here since the following calls to action.finish() may invalidate it
-    action.update_remains(lrint(action.get_variable()->get_value() * delta));
+    action.update_remains(rint(action.get_variable()->get_value() * delta));
     action.update_max_duration(delta);
 
     if (((action.get_remains_no_update() <= 0) && (action.get_variable()->get_penalty() > 0)) ||
@@ -61,26 +59,19 @@ void DiskS19Model::update_actions_state(double /*now*/, double delta)
 /************
  * Resource *
  ************/
-
-DiskS19::DiskS19(DiskModel* model, const std::string& name, lmm::System* maxminSystem, double read_bw, double write_bw)
-    : DiskImpl(model, name, maxminSystem, read_bw, write_bw)
-{
-  XBT_DEBUG("Create resource with read_bw '%f' write_bw '%f'", read_bw, write_bw);
-}
-
 DiskAction* DiskS19::io_start(sg_size_t size, s4u::Io::OpType type)
 {
-  return new DiskS19Action(get_model(), size, not is_on(), this, type);
+  return new DiskS19Action(get_model(), static_cast<double>(size), not is_on(), this, type);
 }
 
 DiskAction* DiskS19::read(sg_size_t size)
 {
-  return new DiskS19Action(get_model(), size, not is_on(), this, s4u::Io::OpType::READ);
+  return new DiskS19Action(get_model(), static_cast<double>(size), not is_on(), this, s4u::Io::OpType::READ);
 }
 
 DiskAction* DiskS19::write(sg_size_t size)
 {
-  return new DiskS19Action(get_model(), size, not is_on(), this, s4u::Io::OpType::WRITE);
+  return new DiskS19Action(get_model(), static_cast<double>(size), not is_on(), this, s4u::Io::OpType::WRITE);
 }
 
 /**********
@@ -96,10 +87,10 @@ DiskS19Action::DiskS19Action(Model* model, double cost, bool failed, DiskImpl* d
   model->get_maxmin_system()->expand(disk->get_constraint(), get_variable(), 1.0);
   switch (type) {
     case s4u::Io::OpType::READ:
-      model->get_maxmin_system()->expand(disk->constraint_read_, get_variable(), 1.0);
+      model->get_maxmin_system()->expand(disk->get_read_constraint(), get_variable(), 1.0);
       break;
     case s4u::Io::OpType::WRITE:
-      model->get_maxmin_system()->expand(disk->constraint_write_, get_variable(), 1.0);
+      model->get_maxmin_system()->expand(disk->get_write_constraint(), get_variable(), 1.0);
       break;
     default:
       THROW_UNIMPLEMENTED;