these archaic callbacks are not used anymore, so kill them

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

diff --git a/src/surf/HostImpl.cpp b/src/surf/HostImpl.cpp
index f4c07b3..32e7c03 100644 (file)
--- a/src/surf/HostImpl.cpp
+++ b/src/surf/HostImpl.cpp
@@ -4,6 +4,8 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
+#include "src/simix/smx_private.hpp"
+
 #include <string>
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_host, surf, "Logging specific to the SURF host module");
@@ -32,13 +34,13 @@ void HostModel::ignore_empty_vm_in_pm_LMM()
     int active_tasks = cpu->get_constraint()->get_variable_amount();
 
     /* The impact of the VM over its PM is the min between its vCPU amount and the amount of tasks it contains */
-    int impact = std::min(active_tasks, ws_vm->getImpl()->coreAmount());
+    int impact = std::min(active_tasks, ws_vm->get_impl()->get_core_amount());
 
     XBT_DEBUG("set the weight of the dummy CPU action of VM%p on PM to %d (#tasks: %d)", ws_vm, impact, active_tasks);
     if (impact > 0)
-      ws_vm->getImpl()->action_->set_priority(1. / impact);
+      ws_vm->get_impl()->action_->set_priority(1. / impact);
     else
-      ws_vm->getImpl()->action_->set_priority(0.);
+      ws_vm->get_impl()->action_->set_priority(0.);
   }
 }
 
@@ -55,7 +57,7 @@ kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** h
                                                       double* bytes_amount, double rate)
 {
   kernel::resource::Action* action = nullptr;
-  if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0)) {
+  if ((host_nb == 1) && (has_cost(bytes_amount, 0) <= 0) && (has_cost(flops_amount, 0) > 0)) {
     action = host_list[0]->pimpl_cpu->execution_start(flops_amount[0]);
   } else if ((host_nb == 1) && (has_cost(flops_amount, 0) <= 0)) {
     action = surf_network_model->communicate(host_list[0], host_list[0], bytes_amount[0], rate);
@@ -85,9 +87,6 @@ kernel::resource::Action* HostModel::execute_parallel(int host_nb, s4u::Host** h
         " - Self-comms with one host only\n"
         " - Communications with two hosts and no computation");
   }
-  delete[] host_list;
-  delete[] flops_amount;
-  delete[] bytes_amount;
   return action;
 }
 
@@ -101,6 +100,73 @@ HostImpl::HostImpl(s4u::Host* host) : piface_(host)
   piface_->pimpl_ = this;
 }
 
+HostImpl::~HostImpl()
+{
+  /* All processes should be gone when the host is turned off (by the end of the simulation). */
+  if (not process_list_.empty()) {
+    std::string msg = std::string("Shutting down host, but it's not empty:");
+    for (auto const& process : process_list_)
+      msg += "\n\t" + std::string(process.get_name());
+
+    SIMIX_display_process_status();
+    THROWF(arg_error, 0, "%s", msg.c_str());
+  }
+  for (auto const& arg : actors_at_boot_)
+    delete arg;
+  actors_at_boot_.clear();
+}
+
+/** Re-starts all the actors that are marked as restartable.
+ *
+ * Weird things will happen if you turn on an host that is already on. S4U is fool-proof, not this.
+ */
+void HostImpl::turn_on()
+{
+  for (auto const& arg : actors_at_boot_) {
+    XBT_DEBUG("Booting Actor %s(%s) right now", arg->name.c_str(), arg->host->get_cname());
+    smx_actor_t actor =
+        SIMIX_process_create(arg->name.c_str(), arg->code, nullptr, arg->host, arg->properties.get(), nullptr);
+    if (arg->kill_time >= 0)
+      simcall_process_set_kill_time(actor, arg->kill_time);
+    if (arg->auto_restart)
+      actor->auto_restart_ = arg->auto_restart;
+    if (arg->daemon_)
+      actor->daemonize();
+  }
+}
+
+/** Kill all actors hosted here */
+void HostImpl::turn_off()
+{
+  if (not process_list_.empty()) {
+    for (auto& actor : process_list_) {
+      XBT_DEBUG("Killing Actor %s@%s on behalf of %s which turned off that host.", actor.get_cname(),
+                actor.host_->get_cname(), SIMIX_process_self()->get_cname());
+      SIMIX_process_kill(&actor, SIMIX_process_self());
+    }
+  }
+  // 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_), [](kernel::actor::ProcessArg* arg) {
+    if (arg->auto_restart)
+      return false;
+    delete arg;
+    return true;
+  });
+  actors_at_boot_.erase(elm, end(actors_at_boot_));
+}
+
+std::vector<s4u::ActorPtr> HostImpl::get_all_actors()
+{
+  std::vector<s4u::ActorPtr> res;
+  for (auto& actor : process_list_)
+    res.push_back(actor.ciface());
+  return res;
+}
+int HostImpl::get_actor_count()
+{
+  return process_list_.size();
+}
 std::vector<const char*> HostImpl::get_attached_storages()
 {
   std::vector<const char*> storages;