X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e295c984a0d5f6ba7d8ae0e802a46d1b642c2ba2..5774e50106ed0c53c47ab4651fb95ae5061954fd:/src/plugins/vm/VirtualMachineImpl.cpp

diff --git a/src/plugins/vm/VirtualMachineImpl.cpp b/src/plugins/vm/VirtualMachineImpl.cpp
index deecf72441..b7ccd74e5f 100644
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@ -5,6 +5,7 @@
 
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
 #include "simgrid/Exception.hpp"
+#include "simgrid/s4u/Exec.hpp"
 #include "src/include/surf/surf.hpp"
 #include "src/kernel/activity/ExecImpl.hpp"
 
@@ -51,25 +52,45 @@ static void host_state_change(s4u::Host const& host)
   }
 }
 
-static s4u::VirtualMachine* get_vm_from_task(kernel::activity::ActivityImpl const& task)
+static void add_active_exec(s4u::Actor const&, s4u::Exec const& task)
 {
-  auto* exec = dynamic_cast<kernel::activity::ExecImpl const*>(&task);
+  s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
+  if (vm != nullptr) {
+    VirtualMachineImpl* vm_impl = vm->get_impl();
+    vm_impl->active_tasks_      = vm_impl->active_tasks_ + 1;
+    vm_impl->update_action_weight();
+  }
+}
+
+static void remove_active_exec(s4u::Actor const&, s4u::Exec const& task)
+{
+  s4u::VirtualMachine* vm = dynamic_cast<s4u::VirtualMachine*>(task.get_host());
+  if (vm != nullptr) {
+    VirtualMachineImpl* vm_impl = vm->get_impl();
+    vm_impl->active_tasks_      = vm_impl->active_tasks_ - 1;
+    vm_impl->update_action_weight();
+  }
+}
+
+static s4u::VirtualMachine* get_vm_from_activity(kernel::activity::ActivityImpl const& act)
+{
+  auto* exec = dynamic_cast<kernel::activity::ExecImpl const*>(&act);
   return exec != nullptr ? dynamic_cast<s4u::VirtualMachine*>(exec->get_host()) : nullptr;
 }
 
-static void add_active_task(kernel::activity::ActivityImpl const& task)
+static void add_active_activity(kernel::activity::ActivityImpl const& act)
 {
-  s4u::VirtualMachine* vm = get_vm_from_task(task);
+  s4u::VirtualMachine* vm = get_vm_from_activity(act);
   if (vm != nullptr) {
     VirtualMachineImpl *vm_impl = vm->get_impl();
     vm_impl->active_tasks_ = vm_impl->active_tasks_ + 1;
-    vm_impl->update_action_weight(); 
+    vm_impl->update_action_weight();
   }
 }
 
-static void remove_active_task(kernel::activity::ActivityImpl const& task)
+static void remove_active_activity(kernel::activity::ActivityImpl const& act)
 {
-  s4u::VirtualMachine* vm = get_vm_from_task(task);
+  s4u::VirtualMachine* vm = get_vm_from_activity(act);
   if (vm != nullptr) {
     VirtualMachineImpl *vm_impl = vm->get_impl();
     vm_impl->active_tasks_ = vm_impl->active_tasks_ - 1;
@@ -81,13 +102,13 @@ VMModel::VMModel()
 {
   all_existing_models.push_back(this);
   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);
+  s4u::Exec::on_start.connect(add_active_exec);
+  s4u::Exec::on_completion.connect(remove_active_exec);
+  kernel::activity::ActivityImpl::on_resumed.connect(add_active_activity);
+  kernel::activity::ActivityImpl::on_suspended.connect(remove_active_activity);
 }
 
-double VMModel::next_occuring_event(double now)
+double VMModel::next_occurring_event(double now)
 {
   /* TODO: update action's cost with the total cost of processes on the VM. */
 
@@ -128,7 +149,7 @@ double VMModel::next_occuring_event(double now)
   }
 
   /* 2. Ready. Get the next occurring event */
-  return surf_cpu_model_vm->next_occuring_event(now);
+  return surf_cpu_model_vm->next_occurring_event(now);
 }
 
 /************
@@ -179,16 +200,16 @@ void VirtualMachineImpl::suspend(smx_actor_t issuer)
     throw VmFailureException(XBT_THROW_POINT, xbt::string_printf("Actor %s cannot suspend the VM %s in which it runs",
                                                                  issuer->get_cname(), piface_->get_cname()));
 
-  XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list_.size());
+  XBT_DEBUG("suspend VM(%s), where %zu actors exist", piface_->get_cname(), get_actor_count());
 
   action_->suspend();
 
-  for (auto& smx_process : process_list_) {
-    XBT_DEBUG("suspend %s", smx_process.get_cname());
-    smx_process.suspend();
+  for (auto& actor : actor_list_) {
+    XBT_DEBUG("suspend %s", actor.get_cname());
+    actor.suspend();
   }
 
-  XBT_DEBUG("suspend all processes on the VM done done");
+  XBT_DEBUG("suspend all actors on the VM done done");
 
   vm_state_ = s4u::VirtualMachine::state::SUSPENDED;
 }
@@ -199,13 +220,13 @@ void VirtualMachineImpl::resume()
     throw VmFailureException(XBT_THROW_POINT,
                              xbt::string_printf("Cannot resume VM %s: it was not suspended", piface_->get_cname()));
 
-  XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list_.size());
+  XBT_DEBUG("Resume VM %s, containing %zu actors.", piface_->get_cname(), get_actor_count());
 
   action_->resume();
 
-  for (auto& smx_process : process_list_) {
-    XBT_DEBUG("resume %s", smx_process.get_cname());
-    smx_process.resume();
+  for (auto& actor : actor_list_) {
+    XBT_DEBUG("resume %s", actor.get_cname());
+    actor.resume();
   }
 
   vm_state_ = s4u::VirtualMachine::state::RUNNING;
@@ -238,12 +259,12 @@ void VirtualMachineImpl::shutdown(smx_actor_t issuer)
     XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName);
   }
 
-  XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list_.size());
+  XBT_DEBUG("shutdown VM %s, that contains %zu actors", piface_->get_cname(), get_actor_count());
 
-  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.get_host()->get_cname(), issuer->get_cname());
-    issuer->kill(&smx_process);
+  for (auto& actor : actor_list_) {
+    XBT_DEBUG("kill %s@%s on behalf of %s which shutdown that VM.", actor.get_cname(), actor.get_host()->get_cname(),
+              issuer->get_cname());
+    issuer->kill(&actor);
   }
 
   set_state(s4u::VirtualMachine::state::DESTROYED);
@@ -262,7 +283,7 @@ void VirtualMachineImpl::set_physical_host(s4u::Host* destination)
   std::string pm_name_dst = destination->get_name();
 
   /* update net_elm with that of the destination physical host */
-  piface_->pimpl_netpoint = destination->pimpl_netpoint;
+  piface_->set_netpoint(destination->get_netpoint());
 
   physical_host_ = destination;