merge msg_vm.c - adrien (please note that there is one line (destruction of the tx_pr...

[simgrid.git] / src / bindings / java / org / simgrid / msg / VM.java

diff --git a/src/bindings/java/org/simgrid/msg/VM.java b/src/bindings/java/org/simgrid/msg/VM.java
index 538a9ec..b858c49 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -1,13 +1,11 @@
-/*
- * JNI interface to virtual machine in Simgrid
- * 
- * Copyright 2006-2012 The SimGrid Team.           
- * All right 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.
- */
+/* JNI interface to virtual machine in Simgrid */
+
+/* Copyright (c) 2006-2014. 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. */
+
 package org.simgrid.msg;
 
 import org.simgrid.msg.Host;
@@ -23,7 +21,7 @@ public class VM extends Host{
 
         private static VM[] vms=null;    
     private Host currentHost; 
-    
+
        /* Constructors / destructors */
     /**
         * Create a `basic' VM (i.e. 1 core, 1GB of RAM, other values are not taken into account).
@@ -34,17 +32,16 @@ public class VM extends Host{
 
        /**
         * Create a  VM
-        * @param host, Host node
-        * @param name, name of the machine
-        * @param nCore, number of core
-        * @param ramSize, size of the RAM that should be allocated (in MBytes) 
+        * @param host  Host node
+        * @param name name of the machine
+        * @param nCore number of core
+        * @param ramSize size of the RAM that should be allocated (in MBytes)
         * @param netCap (not used for the moment)
         * @param diskPath (not used for the moment)
         * @param diskSize (not used for the moment)
         * @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
         * @param dpIntensity (dirty page percentage according to migNetSpeed, [0-100], if you don't know put zero ;))
         */
-       
        public VM(Host host, String name, int nCore,  int ramSize, 
                        int netCap, String diskPath, int diskSize, int migNetSpeed, int dpIntensity){
                super();
@@ -84,6 +81,7 @@ public class VM extends Host{
        
 
        /* JNI / Native code */
+
        /* get/set property methods are inherited from the Host class. */
        
        /** Returns whether the given VM is currently suspended
@@ -116,8 +114,8 @@ public class VM extends Host{
        
        /**
         * Natively implemented method create the VM.
-        * @param nCore, number of core
-        * @param ramSize, size of the RAM that should be allocated (in MB) 
+        * @param nCore number of core
+        * @param ramSize size of the RAM that should be allocated (in MB)
         * @param netCap (not used for the moment)
         * @param diskPath (not used for the moment)
         * @param diskSize (not used for the moment)
@@ -126,7 +124,14 @@ public class VM extends Host{
         */
        private native void create(Host host, String name, int nCore, int ramSize, 
                         int netCap, String diskPath, int diskSize, int migNetSpeed, int dpIntensity);
-       
+
+
+       /**
+        * Bound the VM to a certain % of its vcpu capability (e.g. 75% of vm.getSpeed())
+        * @param load percentage (between [0,100]
+        */
+       public native void setBound(int load);
+
        /**
         * start the VM
         */
@@ -142,32 +147,22 @@ public class VM extends Host{
        /**  
         * Invoke native migration routine
        */
-       public native void internalmig(Host destination);
+       public native void internalmig(Host destination) throws Exception; // TODO add throws DoubleMigrationException (i.e. when you call migrate on a VM that is already migrating);
+
 
        
        /** Change the host on which all processes are running
         * (pre-copy is implemented)
         */     
-       public void migrate(Host destination){
-//             String[] argsRx = new String[5];
-//             argsRx[1] = this.getName();
-//             argsRx[2] = this.currentHost.getName();
-//             argsRx[3] = destination.getName();
-//             argsRx[0] =  "__pr_mig_rx:"+argsRx[1]+"("+argsRx[2]+"-"+argsRx[3]+")";
-//             argsRx[4] = null; // TODO: Why ? 
-//             
-//             //Process rx = new Process(destination, argsRx[0], argsRx );
-//             
-//             String[] argsTx = new String[5];
-//             argsTx[1] = this.getName();
-//             argsTx[2] = this.currentHost.getName();
-//             argsTx[3] = destination.getName();
-//             argsTx[0] =  "__pr_mig_tx:"+argsTx[1]+"("+argsTx[2]+"-"+argsTx[3]+")";
-//             argsTx[4] = null; // TODO: Why ? 
-//             
-//             //Process tx = new Process(this.currentHost, argsTx[0], argsRx ); 
-//             
-               this.internalmig(destination);
+       public void migrate(Host destination) throws HostFailureException{
+               try {
+                       this.internalmig(destination);
+               } catch (Exception e){
+                 Msg.info("an exception occurs during the migration of VM "+this.getName());
+                 throw new HostFailureException();
+               }
+               // If the migration correcly returned, then we should change the currentHost value. 
+               this.currentHost = destination; 
        }
        
        /** Immediately suspend the execution of all processes within the given VM