X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f5f3526e46d1e05d293d1a20708dbec9e6682a26..5a97de8c98502af9f74cfceb924fa02e0fd80925:/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 68c92a4e38..b858c49694 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;
@@ -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();
@@ -117,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)
@@ -131,7 +128,7 @@ public class VM extends Host{
 
 	/**
 	 * Bound the VM to a certain % of its vcpu capability (e.g. 75% of vm.getSpeed())
-	 * @param load, percentage (between [0,100]
+	 * @param load percentage (between [0,100]
 	 */
 	public native void setBound(int load);
 
@@ -150,14 +147,21 @@ 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){
-		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; 
 	}