X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/13e64de335db45c87e2d7c8668ce8b16b7cb2139..dfd778758fc244a6bc0290ae86ddf01e9fd4d876:/src/surf/disk_s19.cpp

diff --git a/src/surf/disk_s19.cpp b/src/surf/disk_s19.cpp
index 0f3f4b7423..3c983213e1 100644
--- a/src/surf/disk_s19.cpp
+++ b/src/surf/disk_s19.cpp
@@ -1,17 +1,19 @@
-/* Copyright (c) 2013-2020. 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,18 @@ 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");
+  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);
-}
-
-DiskImpl* DiskS19Model::createDisk(const std::string& id, double read_bw, double write_bw)
-{
-  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_occurring_event(double now)
-{
-  return DiskModel::next_occurring_event_full(now);
+  return (new DiskS19(name, read_bandwidth, write_bandwidth))->set_model(this);
 }
 
 void DiskS19Model::update_actions_state(double /*now*/, double delta)
@@ -61,13 +53,6 @@ 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(), static_cast<double>(size), not is_on(), this, type);
@@ -87,8 +72,8 @@ DiskAction* DiskS19::write(sg_size_t size)
  * Action *
  **********/
 
-DiskS19Action::DiskS19Action(Model* model, double cost, bool failed, DiskImpl* disk, s4u::Io::OpType type)
-    : DiskAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3), disk, type)
+DiskS19Action::DiskS19Action(Model* model, double cost, bool failed, const DiskImpl* disk, s4u::Io::OpType type)
+    : DiskAction(model, cost, failed, model->get_maxmin_system()->variable_new(this, 1.0, -1.0, 3))
 {
   XBT_IN("(%s,%g", disk->get_cname(), cost);
 
@@ -107,35 +92,6 @@ DiskS19Action::DiskS19Action(Model* model, double cost, bool failed, DiskImpl* d
   XBT_OUT();
 }
 
-void DiskS19Action::cancel()
-{
-  set_state(Action::State::FAILED);
-}
-
-void DiskS19Action::suspend()
-{
-  XBT_IN("(%p)", this);
-  if (is_running()) {
-    get_model()->get_maxmin_system()->update_variable_penalty(get_variable(), 0.0);
-    set_suspend_state(Action::SuspendStates::SUSPENDED);
-  }
-  XBT_OUT();
-}
-
-void DiskS19Action::resume()
-{
-  THROW_UNIMPLEMENTED;
-}
-
-void DiskS19Action::set_max_duration(double /*duration*/)
-{
-  THROW_UNIMPLEMENTED;
-}
-
-void DiskS19Action::set_sharing_penalty(double)
-{
-  THROW_UNIMPLEMENTED;
-}
 void DiskS19Action::update_remains_lazy(double /*now*/)
 {
   THROW_IMPOSSIBLE;