X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0bbf68d2f4d063af3201de6ee6598f10a930df70..cad6c60193432c9ec59a758b4932a3bd67382d00:/src/surf/HostImpl.cpp?ds=sidebyside

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index 5be123b3da..9dabe15b66 100644
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -1,12 +1,14 @@
-/* Copyright (c) 2013-2021. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-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/s4u/Engine.hpp"
-#include "simgrid/s4u/Host.hpp"
-#include "src/plugins/vm/VirtualMachineImpl.hpp"
-#include "src/simix/smx_private.hpp"
+#include <simgrid/kernel/routing/NetPoint.hpp>
+#include <simgrid/s4u/Engine.hpp>
+#include <simgrid/s4u/Host.hpp>
+
+#include "src/kernel/EngineImpl.hpp"
+#include "src/kernel/resource/VirtualMachineImpl.hpp"
 
 #include <string>
 
@@ -17,7 +19,8 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(res_host, ker_resource, "Host resources agregate
  *************/
 
 namespace simgrid {
-namespace surf {
+namespace kernel {
+namespace resource {
 
 /*********
  * Model *
@@ -45,7 +48,7 @@ HostImpl::~HostImpl()
     for (auto const& actor : actor_list_)
       msg += "\n\t" + std::string(actor.get_name());
 
-    simix_global->display_all_actor_status();
+    EngineImpl::get_instance()->display_all_actor_status();
     xbt_die("%s", msg.c_str());
   }
   for (auto const& arg : actors_at_boot_)
@@ -53,7 +56,7 @@ HostImpl::~HostImpl()
   actors_at_boot_.clear();
 
   for (auto const& d : disks_)
-    d->destroy();
+    d.second->destroy();
 }
 
 /** @brief Fire the required callbacks and destroy the object
@@ -75,8 +78,8 @@ void HostImpl::turn_on() const
 {
   for (auto const& arg : actors_at_boot_) {
     XBT_DEBUG("Booting Actor %s(%s) right now", arg->name.c_str(), arg->host->get_cname());
-    simgrid::kernel::actor::ActorImplPtr actor = simgrid::kernel::actor::ActorImpl::create(
-        arg->name, arg->code, nullptr, arg->host, arg->properties.get(), nullptr);
+    actor::ActorImplPtr actor = actor::ActorImpl::create(arg->name, arg->code, nullptr, arg->host, nullptr);
+    actor->set_properties(arg->properties);
     if (arg->on_exit)
       *actor->on_exit = *arg->on_exit;
     if (arg->kill_time >= 0)
@@ -89,16 +92,26 @@ void HostImpl::turn_on() const
 }
 
 /** Kill all actors hosted here */
-void HostImpl::turn_off(const kernel::actor::ActorImpl* issuer)
+void HostImpl::turn_off(const actor::ActorImpl* issuer)
 {
   for (auto& actor : actor_list_) {
     XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(),
               actor.get_host()->get_cname(), issuer->get_cname());
     issuer->kill(&actor);
   }
+  for (const auto& activity : EngineImpl::get_instance()->get_maestro()->activities_) {
+    auto* exec = dynamic_cast<activity::ExecImpl*>(activity.get());
+    if (exec != nullptr) {
+      auto hosts = exec->get_hosts();
+      if (std::find(hosts.begin(), hosts.end(), &piface_) != hosts.end()) {
+        exec->cancel();
+        exec->set_state(activity::State::FAILED);
+      }
+    }
+  }
   // When a host is turned off, we want to keep only the actors that should restart for when it will boot again.
   // Then get rid of the others.
-  auto elm = remove_if(begin(actors_at_boot_), end(actors_at_boot_), [](const kernel::actor::ProcessArg* arg) {
+  auto elm = remove_if(begin(actors_at_boot_), end(actors_at_boot_), [](const actor::ProcessArg* arg) {
     if (arg->auto_restart)
       return false;
     delete arg;
@@ -123,33 +136,25 @@ std::vector<s4u::Disk*> HostImpl::get_disks() const
 {
   std::vector<s4u::Disk*> disks;
   for (auto const& d : disks_)
-    disks.push_back(d->get_iface());
+    disks.push_back(d.second->get_iface());
   return disks;
 }
 
-HostImpl* HostImpl::set_disks(const std::vector<kernel::resource::DiskImpl*>& disks)
+s4u::Disk* HostImpl::create_disk(const std::string& name, double read_bandwidth, double write_bandwidth)
 {
-  disks_ = disks;
-  for (auto d : disks_)
-    d->set_host(&piface_);
-  return this;
+  auto disk = piface_.get_netpoint()->get_englobing_zone()->get_disk_model()->create_disk(name, read_bandwidth,
+                                                                                          write_bandwidth);
+  return disk->set_host(&piface_)->get_iface();
 }
 
 void HostImpl::add_disk(const s4u::Disk* disk)
 {
-  disks_.push_back(disk->get_impl());
+  disks_[disk->get_name()] = disk->get_impl();
 }
 
-void HostImpl::remove_disk(const std::string& disk_name)
+void HostImpl::remove_disk(const std::string& name)
 {
-  auto position = disks_.begin();
-  for (auto const& d : disks_) {
-    if (d->get_name() == disk_name) {
-      disks_.erase(position);
-      break;
-    }
-    position++;
-  }
+  disks_.erase(name);
 }
 
 void HostImpl::seal()
@@ -158,8 +163,13 @@ void HostImpl::seal()
     return;
   }
   // seals host's CPU
-  get_iface()->pimpl_cpu->seal();
+  get_iface()->get_cpu()->seal();
   sealed_ = true;
+
+  /* seal its disks */
+  for (auto const& disk : disks_)
+    disk.second->seal();
 }
-} // namespace surf
+} // namespace resource
+} // namespace kernel
 } // namespace simgrid