X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7018d53f4b991df9ddfa5b0c53293118d200efd6..40334ce6fe520b2fa7d1e240716e4f34a5fdc74e:/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 ac8a512561..77cdaeeb1b 100644
--- a/src/bindings/java/org/simgrid/msg/VM.java
+++ b/src/bindings/java/org/simgrid/msg/VM.java
@@ -8,22 +8,20 @@
 
 package org.simgrid.msg;
 
-import org.simgrid.msg.Host;
-import org.simgrid.msg.Process;
 
 public class VM extends Host{
 	// Please note that we are not declaring a new bind variable 
 	//(the bind variable has been inherited from the super class Host)
-	
+
 	/* Static functions */ 
 	// GetByName is inherited from the super class Host
-	
 
-	 private static VM[] vms=null; 	  
-    private Host currentHost; 
+
+	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) {
@@ -53,41 +51,47 @@ public class VM extends Host{
 
 	private static void addVM(VM vm){
 		VM[] vmsN=null; 
-	  	int i=0;
+		int i=0;
 		if(VM.vms == null)
 			vmsN = new VM[1]; 
 		else
 			vmsN = new VM[vms.length+1]; 
-		
+
 		for (i=0; i<vmsN.length-1 ; i ++){
 			vmsN[i]=vms[i];	
 		} 
 		vmsN[i]=vm;
 		vms=vmsN;
 	}
-   public static VM[] all(){
+	public static VM[] all(){
 		return vms;
 	}
 	public static VM getVMByName(String name){
 		for (int i=0 ; i < vms.length ; i++){
-			  if (vms[i].getName().equals(name))
-					return vms[i];		
+			if (vms[i].getName().equals(name))
+				return vms[i];		
 		}
 		return null; 
 	}
-	protected void finalize() {
-		destroy();
+	@Override
+	public void finalize() {
+		try {
+			nativeFinalize();
+		} catch (Throwable e) {
+			e.printStackTrace();
+		}
 	}
-	
+	private native void nativeFinalize();
+
 
 	/* JNI / Native code */
 
 	/* get/set property methods are inherited from the Host class. */
-	
+
 	/** Returns whether the given VM is currently suspended
 	 */	
 	public native int isCreated();
-	
+
 	/** Returns whether the given VM is currently running
 	 */
 	public native int isRunning();
@@ -95,15 +99,15 @@ public class VM extends Host{
 	/** Returns whether the given VM is currently running
 	 */
 	public native int isMigrating();
-	
+
 	/** Returns whether the given VM is currently suspended
 	 */	
 	public native int isSuspended();
-		
+
 	/** Returns whether the given VM is currently saving
 	 */
 	public native int isSaving();
-	
+
 	/** Returns whether the given VM is currently saved
 	 */
 	public native int isSaved();
@@ -111,7 +115,7 @@ public class VM extends Host{
 	/** Returns whether the given VM is currently restoring its state
 	 */
 	public native boolean isRestoring();
-	
+
 	/**
 	 * Natively implemented method create the VM.
 	 * @param nCore number of core
@@ -123,7 +127,7 @@ public class VM extends Host{
 	 * @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, int ramSize, 
-			 int netCap, String diskPath, int diskSize, int migNetSpeed, int dpIntensity);
+			int netCap, String diskPath, int diskSize, int migNetSpeed, int dpIntensity);
 
 
 	/**
@@ -137,20 +141,20 @@ public class VM extends Host{
 	 */
 	public native void start();
 
-	
+
 	/**
 	 * Immediately kills all processes within the given VM. Any memory that they allocated will be leaked.
 	 * No extra delay occurs. If you want to simulate this too, you want to use a MSG_process_sleep() or something
 	 */
 	public native void shutdown();
-	
+
 	/**  
 	 * Invoke native migration routine
-	*/
+	 */
 	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)
 	 */	
@@ -164,7 +168,7 @@ public class VM extends Host{
 		// 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
 	 *
 	 * No suspension cost occurs. If you want to simulate this too, you want to
@@ -172,7 +176,7 @@ public class VM extends Host{
 	 * of VM suspend to you.
 	 */	
 	public native void suspend();
-	
+
 	/** Immediately resumes the execution of all processes within the given VM
 	 *
 	 * No resume cost occurs. If you want to simulate this too, you want to
@@ -180,7 +184,7 @@ public class VM extends Host{
 	 * of VM resume to you.
 	 */
 	public native void resume();
-	
+
 	/** Immediately suspend the execution of all processes within the given VM 
 	 *  and save its state on the persistent HDD
 	 *  Not yet implemented (for the moment it behaves like suspend)
@@ -189,7 +193,7 @@ public class VM extends Host{
 	 *  of VM suspend to you.
 	 */	
 	public native void save();
-	
+
 	/** Immediately resumes the execution of all processes previously saved 
 	 * within the given VM
 	 *  Not yet implemented (for the moment it behaves like resume)
@@ -199,14 +203,7 @@ public class VM extends Host{
 	 * of VM resume to you.
 	 */
 	public native void restore();
-	
-
-	/**
-	 * Destroy the VM
-	 */
-	public native void destroy();
 
-	
 
 	/**
 	 * Class initializer, to initialize various JNI stuff