X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4fb1548b520dfebdd649916e63f588569aa599c9..5b9ad84fa8c98062be8d44fce9dc54bf44f29564:/org/simgrid/msg/Process.java

diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java
index 82e6c4fe16..c6005d6030 100644
--- a/org/simgrid/msg/Process.java
+++ b/org/simgrid/msg/Process.java
@@ -1,12 +1,10 @@
 /*
- * $Id$
- *
- * Copyright 2006,2007 Martin Quinson, Malek Cherier           
+ * 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. 
+ * (GNU LGPL) which comes with this package.
  */
 
 package org.simgrid.msg;
@@ -54,7 +52,7 @@ public abstract class Process implements Runnable {
 	 * a native process. Even if this attribute is public you must never
 	 * access to it. It is set automatically during the build of the object.
 	 */
-	public long bind;
+	private long bind;
 	/**
 	 * Indicates if the process is started
 	 */
@@ -230,16 +228,22 @@ public abstract class Process implements Runnable {
 	/**
 	 * Suspends the process by suspending the task on which it was
 	 * waiting for the completion.
-	 *
 	 */
-	public native void pause();
+	public native void suspend();
+	/**
+	 * Suspends the process by suspending the task on which it was
+	 * waiting for the completion.
+	 * DEPRECATED: use suspend instead.
+	 */
+	@Deprecated
+	public void pause() {
+		suspend();
+	}
 	/**
 	 * Resumes a suspended process by resuming the task on which it was
 	 * waiting for the completion.
-	 *
-	 *
-	 */ 
-	public native void restart();
+	 */
+	public native void resume();	
 	/**
 	 * Tests if a process is suspended.
 	 *
@@ -288,6 +292,12 @@ public abstract class Process implements Runnable {
 	public int getPPID()  {
 		return ppid;
 	}
+	/**
+	 * Set the kill time of the process
+	 * @param killTime the time when the process is killed
+	 */
+	public native void setKillTime(double killTime);
+	
 	/**
 	 * This static method returns the currently running process.
 	 *
@@ -302,7 +312,7 @@ public abstract class Process implements Runnable {
 	 * @param host			The host where to migrate the process.
 	 *
 	 */
-	public native static void migrate(Process process, Host host);	
+	public native void migrate(Host host);	
 	/**
 	 * Makes the current process sleep until millis millisecondes have elapsed.
 	 * You should note that unlike "waitFor" which takes seconds, this method takes milliseconds.
@@ -371,6 +381,7 @@ public abstract class Process implements Runnable {
 		 catch(ProcessKilledError pk) {
 			 
 		 }	
+		exit();
 	}
 
 	/**
@@ -381,7 +392,7 @@ public abstract class Process implements Runnable {
      */
 	public abstract void main(String[]args) throws MsgException;
 
-    
+	public native void exit();    
 	/**
 	 * Class initializer, to initialize various JNI stuff
 	 */