X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c078a363724fe8ef749dfbda30f09b5f471643f7..7018d53f4b991df9ddfa5b0c53293118d200efd6:/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 675da0bf11..ac8a512561 100644
--- 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,24 +21,33 @@ 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 +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
@@ -106,15 +114,24 @@ 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 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)
+	 * @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
 	 */
@@ -130,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("Migration of VM "+this.getName()+" to "+destination.getName()+" is impossible ("+e.getMessage()+")");
+		  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