get rid of vm->isMigrating()

There already was an equivalent in the live migration plugin. This
method was only used internally to detect if a VM was destroyed while
it was migrating. This is now useless.

diff --git a/include/simgrid/s4u/VirtualMachine.hpp b/include/simgrid/s4u/VirtualMachine.hpp
index 233be56..2ec81c7 100644 (file)
--- a/include/simgrid/s4u/VirtualMachine.hpp
+++ b/include/simgrid/s4u/VirtualMachine.hpp
@@ -51,8 +51,6 @@ public:
   void shutdown();
   void destroy();
 
   void shutdown();
   void destroy();
 

-  bool isMigrating();
-

   simgrid::s4u::Host* getPm();
   void setPm(simgrid::s4u::Host * pm);
   size_t getRamsize();
   simgrid::s4u::Host* getPm();
   void setPm(simgrid::s4u::Host * pm);
   size_t getRamsize();

diff --git a/src/bindings/java/jmsg_process.cpp b/src/bindings/java/jmsg_process.cpp
index 05ba285..10645cf 100644 (file)
--- a/src/bindings/java/jmsg_process.cpp
+++ b/src/bindings/java/jmsg_process.cpp
@@ -200,7 +200,7 @@ JNICALL Java_org_simgrid_msg_Process_setAutoRestart (JNIEnv *env, jobject jproce
     return;
   }
 
     return;
   }
 

-  MSG_process_auto_restart_set(process, (jauto_restart == JNI_TRUE));
+  process->setAutoRestart(jauto_restart == JNI_TRUE);

 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *env, jobject jprocess) {
 }
 
 JNIEXPORT void JNICALL Java_org_simgrid_msg_Process_restart (JNIEnv *env, jobject jprocess) {

diff --git a/src/plugins/vm/VmLiveMigration.cpp b/src/plugins/vm/VmLiveMigration.cpp
index bac67f3..e04f676 100644 (file)
--- a/src/plugins/vm/VmLiveMigration.cpp
+++ b/src/plugins/vm/VmLiveMigration.cpp
@@ -292,7 +292,7 @@ SG_BEGIN_DECL()
 
 static void onVirtualMachineShutdown(simgrid::s4u::VirtualMachine* vm)
 {
 
 static void onVirtualMachineShutdown(simgrid::s4u::VirtualMachine* vm)
 {

-  if (vm->isMigrating()) {
+  if (vm->getImpl()->isMigrating) {

     vm->extension<simgrid::vm::VmMigrationExt>()->rx_->kill();
     vm->extension<simgrid::vm::VmMigrationExt>()->tx_->kill();
     vm->extension<simgrid::vm::VmMigrationExt>()->issuer_->kill();
     vm->extension<simgrid::vm::VmMigrationExt>()->rx_->kill();
     vm->extension<simgrid::vm::VmMigrationExt>()->tx_->kill();
     vm->extension<simgrid::vm::VmMigrationExt>()->issuer_->kill();


@@ -326,7 +326,7 @@ simgrid::s4u::VirtualMachine* sg_vm_create_migratable(simgrid::s4u::Host* pm, co
 
 int sg_vm_is_migrating(simgrid::s4u::VirtualMachine* vm)
 {
 
 int sg_vm_is_migrating(simgrid::s4u::VirtualMachine* vm)
 {

-  return vm->isMigrating();
+  return vm->getImpl()->isMigrating;

 }
 
 void sg_vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm)
 }
 
 void sg_vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm)


@@ -339,7 +339,7 @@ void sg_vm_migrate(simgrid::s4u::VirtualMachine* vm, simgrid::s4u::Host* dst_pm)
     THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->getCname(), dst_pm->getCname());
   if (vm->getState() != SURF_VM_STATE_RUNNING)
     THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->getCname());
     THROWF(vm_error, 0, "Cannot migrate VM '%s' to host '%s', which is offline.", vm->getCname(), dst_pm->getCname());
   if (vm->getState() != SURF_VM_STATE_RUNNING)
     THROWF(vm_error, 0, "Cannot migrate VM '%s' that is not running yet.", vm->getCname());

-  if (vm->isMigrating())
+  if (vm->getImpl()->isMigrating)

     THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->getCname());
 
   vm->getImpl()->isMigrating = true;
     THROWF(vm_error, 0, "Cannot migrate VM '%s' that is already migrating.", vm->getCname());
 
   vm->getImpl()->isMigrating = true;

diff --git a/src/plugins/vm/s4u_VirtualMachine.cpp b/src/plugins/vm/s4u_VirtualMachine.cpp
index 848098e..5688946 100644 (file)
--- a/src/plugins/vm/s4u_VirtualMachine.cpp
+++ b/src/plugins/vm/s4u_VirtualMachine.cpp
@@ -142,11 +142,6 @@ void VirtualMachine::destroy()
   Host::destroy();
 }
 
   Host::destroy();
 }
 

-bool VirtualMachine::isMigrating()
-{
-  return pimpl_vm_ && pimpl_vm_->isMigrating;
-}
-

 simgrid::s4u::Host* VirtualMachine::getPm()
 {
   return pimpl_vm_->getPm();
 simgrid::s4u::Host* VirtualMachine::getPm()
 {
   return pimpl_vm_->getPm();