Merge tag 'v3_9_90' into hypervisor

[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 675da0b..7b73404 100644 (file)
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -1,7 +1,7 @@
 /*
  * JNI interface to virtual machine in Simgrid
  * 
- * Copyright 2006-2012 The SimGrid Team.           
+ * Copyright (c) 2006-2013. The SimGrid Team.
  * All right reserved. 
  *
  * This program is free software; you can redistribute 
@@ -23,24 +23,34 @@ 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).
         */
        public VM(Host host, String name) {
-               this(host,name,1,1024*1024*1024, -1, null, -1);
+               this(host,name,1,1024, -1, null, -1,0 , 0);
        }
 
        /**
-        * Create a `basic' VM (i.e. 1 core, 1GB of RAM, other values are not taken into account).
+        * 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 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,  long ramSize, 
-                        long netCap, String diskPath, long diskSize){
+       
+       public VM(Host host, String name, int nCore,  int ramSize, 
+                       int netCap, String diskPath, int diskSize, int migNetSpeed, int dpIntensity){
                super();
                super.name = name; 
                this.currentHost = host; 
-               create(host, name, nCore, ramSize, netCap, diskPath, diskSize);
+               create(host, name, nCore, ramSize, netCap, diskPath, diskSize, migNetSpeed, dpIntensity);
                VM.addVM(this);
        }
 
@@ -74,6 +84,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
@@ -107,14 +118,23 @@ 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 
+        * @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)
+        * @param migNetSpeed (network bandwith allocated for migrations in MB/s, if you don't know put zero ;))
+        * @param dpIntensity (dirty page intensity, a percentage of migNetSpeed [0-100],  if you don't know put zero ;))
         */
-       private native void create(Host host, String name, int nCore, long ramSize, 
-                        long netCap, String diskPath, long diskSize);
-       
+       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
         */
@@ -137,25 +157,8 @@ public class VM extends Host{
         * (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);
+               this.currentHost = destination; 
        }
        
        /** Immediately suspend the execution of all processes within the given VM