From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 3 Jul 2018 20:51:22 +0000 (+0200)
Subject: Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
X-Git-Tag: v3_21~576
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b52efac1269b9d45904bc117d695b2d3f2c63376

Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid
---

b52efac1269b9d45904bc117d695b2d3f2c63376
diff --cc src/plugins/vm/VirtualMachineImpl.cpp
index 078b3ab038,9e7fa1e32f..ceae075f23
--- a/src/plugins/vm/VirtualMachineImpl.cpp
+++ b/src/plugins/vm/VirtualMachineImpl.cpp
@@@ -147,12 -147,11 +147,11 @@@ void VirtualMachineImpl::suspend(smx_ac
      THROWF(vm_error, 0, "Actor %s cannot suspend the VM %s in which it runs", issuer->get_cname(),
             piface_->get_cname());
  
-   auto& process_list = piface_->pimpl_->process_list_;
--  XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list.size());
++  XBT_DEBUG("suspend VM(%s), where %zu processes exist", piface_->get_cname(), process_list_.size());
  
    action_->suspend();
  
--  for (auto& smx_process : process_list) {
++  for (auto& smx_process : process_list_) {
      XBT_DEBUG("suspend %s", smx_process.get_cname());
      smx_process.suspend(issuer);
    }
@@@ -167,12 -166,11 +166,11 @@@ void VirtualMachineImpl::resume(
    if (get_state() != s4u::VirtualMachine::state::SUSPENDED)
      THROWF(vm_error, 0, "Cannot resume VM %s: it was not suspended", piface_->get_cname());
  
-   auto& process_list = piface_->pimpl_->process_list_;
--  XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list.size());
++  XBT_DEBUG("Resume VM %s, containing %zu processes.", piface_->get_cname(), process_list_.size());
  
    action_->resume();
  
--  for (auto& smx_process : process_list) {
++  for (auto& smx_process : process_list_) {
      XBT_DEBUG("resume %s", smx_process.get_cname());
      smx_process.resume();
    }
@@@ -208,10 -206,9 +206,9 @@@ void VirtualMachineImpl::shutdown(smx_a
      XBT_VERB("Shutting down the VM %s even if it's not running but %s", piface_->get_cname(), stateName);
    }
  
-   auto& process_list = piface_->pimpl_->process_list_;
--  XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list.size());
++  XBT_DEBUG("shutdown VM %s, that contains %zu processes", piface_->get_cname(), process_list_.size());
  
--  for (auto& smx_process : process_list) {
++  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);