Bugfix in Process.waitFor and Process.sleep: Throw the expected

[simgrid.git] / org / simgrid / msg / Process.java

diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java
index 380335a..abdd52c 100644 (file)
--- a/org/simgrid/msg/Process.java
+++ b/org/simgrid/msg/Process.java
@@ -55,19 +55,31 @@ public abstract class Process implements Runnable {
         * access to it. It is set automatically during the build of the object.
         */
        public long bind;
-
+       /**
+        * Indicates if the process is started
+        */
+       boolean started;
        /**
         * Even if this attribute is public you must never access to it.
         * It is used to compute the id of an MSG process.
         */
        public static long nextProcessId = 0;
-
+       
        /**
         * Even if this attribute is public you must never access to it.
         * It is compute automatically during the creation of the object. 
         * The native functions use this identifier to synchronize the process.
         */
        public long id;
+       
+       /**
+        * Start time of the process
+        */
+       public double startTime = 0;
+       /**
+        * Kill time of the process
+        */
+       public double killTime = -1;
 
     public Hashtable<String,String> properties;
 
@@ -90,6 +102,7 @@ public abstract class Process implements Runnable {
 
        /** The arguments of the method function of the process. */     
        public Vector<String> args;
+
        
        /**
         * Default constructor (used in ApplicationHandler to initialize it)
@@ -151,10 +164,32 @@ public abstract class Process implements Runnable {
         * @param host                  The host of the process to create.
         * @param name                  The name of the process.
         * @param args                  The arguments of main method of the process.
+        */     
+       public Process(Host host, String name, String[]args) {
+               this();
+               this.host = host;
+               if (name == null)
+                       throw new NullPointerException("Process name cannot be NULL");
+               this.name = name;
+
+               this.args = new Vector<String>();
+               if (null != args)
+                       this.args.addAll(Arrays.asList(args));
+               
+               this.properties = new Hashtable<String,String>();
+       }       
+       /**
+        * Constructs a new process from a host and his name, the arguments of here method function are
+        * specified by the parameter args.
+        *
+        * @param host                  The host of the process to create.
+        * @param name                  The name of the process.
+        * @param args                  The arguments of main method of the process.
+        * @param startTime             Start time of the process
+        * @param killTime              Kill time of the process
         *
         */
-       public Process(Host host, String name, String[]args) {
-               /* This is the constructor called by all others */
+       public Process(Host host, String name, String[]args, double startTime, double killTime) {
                this();
                this.host = host;
                if (name == null)
@@ -167,6 +202,8 @@ public abstract class Process implements Runnable {
                
                this.properties = new Hashtable<String,String>();
                
+               this.startTime = startTime;
+               this.killTime = killTime;               
        }
        /**
         * The natively implemented method to create an MSG process.
@@ -273,7 +310,7 @@ public abstract class Process implements Runnable {
         * FIXME: Not optimal, maybe we should have two native functions.
         * @param millis the length of time to sleep in milliseconds.
         */
-       public static void sleep(long millis)  {
+       public static void sleep(long millis) throws HostFailureException  {
                sleep(millis,0);
        }
        /**
@@ -284,12 +321,12 @@ public abstract class Process implements Runnable {
         * @param millis the length of time to sleep in milliseconds.
         * @param nanos additionnal nanoseconds to sleep.
         */
-       public native static void sleep(long millis, int nanos);
+       public native static void sleep(long millis, int nanos) throws HostFailureException;
        /**
         * Makes the current process sleep until time seconds have elapsed.
         * @param seconds               The time the current process must sleep.
         */ 
-       public native void waitFor(double seconds);    
+       public native void waitFor(double seconds) throws HostFailureException;    
        /**
      *
      */
@@ -302,10 +339,14 @@ public abstract class Process implements Runnable {
        }
     /**
      * This method actually creates and run the process.
+     * It is a noop if the process is already launched.
      * @throws HostNotFoundException
      */
-    public void start() throws HostNotFoundException {
-       create(host.getName());
+    public final void start() throws HostNotFoundException {
+       if (!started) {
+               started = true;
+               create(host.getName());
+       }
     }
     
        /**
@@ -329,7 +370,7 @@ public abstract class Process implements Runnable {
                        System.exit(1);
                }
                 catch(ProcessKilledError pk) {
-
+                        
                 }      
        }