week-end cleanups in ActorImpl

[simgrid.git] / src / plugins / vm / VirtualMachineImpl.cpp

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index 3ba781b..727bc34 100644 (file)
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2019. 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. */
@@ -40,9 +40,9 @@ std::deque<s4u::VirtualMachine*> VirtualMachineImpl::allVms_;
  */
 const double virt_overhead = 1; // 0.95
 
-static void hostStateChange(s4u::Host& host)
+static void host_state_change(s4u::Host& host)
 {
-  if (host.is_off()) { // just turned off.
+  if (not host.is_on()) { // just turned off.
     std::vector<s4u::VirtualMachine*> trash;
     /* Find all VMs living on that host */
     for (s4u::VirtualMachine* const& vm : VirtualMachineImpl::allVms_)
@@ -53,9 +53,15 @@ static void hostStateChange(s4u::Host& host)
   }
 }
 
-static void addActiveTask(kernel::activity::ExecImplPtr exec)
+static s4u::VirtualMachine* get_vm_from_task(kernel::activity::ActivityImplPtr task)
 {
-  s4u::VirtualMachine *vm = dynamic_cast<s4u::VirtualMachine*>(exec->host_);
+  kernel::activity::ExecImpl* exec = dynamic_cast<kernel::activity::ExecImpl*>(task.get());
+  return exec != nullptr ? dynamic_cast<s4u::VirtualMachine*>(exec->host_) : nullptr;
+}
+
+static void add_active_task(kernel::activity::ActivityImplPtr task)
+{
+  s4u::VirtualMachine* vm = get_vm_from_task(task);
   if (vm != nullptr) {
     VirtualMachineImpl *vm_impl = vm->get_impl();
     vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1;
@@ -63,9 +69,9 @@ static void addActiveTask(kernel::activity::ExecImplPtr exec)
   }
 }
 
-static void removeActiveTask(kernel::activity::ExecImplPtr exec)
+static void remove_active_task(kernel::activity::ActivityImplPtr task)
 {
-  s4u::VirtualMachine *vm = dynamic_cast<s4u::VirtualMachine*>(exec->host_);
+  s4u::VirtualMachine* vm = get_vm_from_task(task);
   if (vm != nullptr) {
     VirtualMachineImpl *vm_impl = vm->get_impl();
     vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1;
@@ -76,11 +82,11 @@ static void removeActiveTask(kernel::activity::ExecImplPtr exec)
 VMModel::VMModel()
 {
   all_existing_models.push_back(this);
-  s4u::Host::on_state_change.connect(hostStateChange);
-  kernel::activity::ExecImpl::on_creation.connect(addActiveTask);
-  kernel::activity::ExecImpl::on_completion.connect(removeActiveTask);
-  kernel::activity::ExecImpl::on_resumed.connect(addActiveTask);
-  kernel::activity::ExecImpl::on_suspended.connect(removeActiveTask);  
+  s4u::Host::on_state_change.connect(host_state_change);
+  kernel::activity::ExecImpl::on_creation.connect(add_active_task);
+  kernel::activity::ExecImpl::on_completion.connect(remove_active_task);
+  kernel::activity::ActivityImpl::on_resumed.connect(add_active_task);
+  kernel::activity::ActivityImpl::on_suspended.connect(remove_active_task);
 }
 
 double VMModel::next_occuring_event(double now)
@@ -167,7 +173,7 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer)
 {
   if (get_state() != s4u::VirtualMachine::state::RUNNING)
     THROWF(vm_error, 0, "Cannot suspend VM %s: it is not running.", piface_->get_cname());
-  if (issuer->host_ == piface_)
+  if (issuer->get_host() == piface_)
     THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->get_cname(),
            piface_->get_cname());
 
@@ -234,8 +240,8 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer)
 
   for (auto& smx_process : process_list_) {
     XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", smx_process.get_cname(),
-              smx_process.host_->get_cname(), issuer->get_cname());
-    SIMIX_process_kill(&smx_process, issuer);
+              smx_process.get_host()->get_cname(), issuer->get_cname());
+    issuer->kill(&smx_process);
   }
 
   set_state(s4u::VirtualMachine::state::DESTROYED);