X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ec855b2eab2825f3870232ef7e0a804963231b0e..0424e24e1f270b3c65b20e994079679b18be3eb8:/src/bindings/java/org/simgrid/msg/Process.java diff --git a/src/bindings/java/org/simgrid/msg/Process.java b/src/bindings/java/org/simgrid/msg/Process.java index 29a69ca6ce..4f29954948 100644 --- a/src/bindings/java/org/simgrid/msg/Process.java +++ b/src/bindings/java/org/simgrid/msg/Process.java @@ -7,7 +7,7 @@ package org.simgrid.msg; import java.util.Arrays; -import java.util.Vector; +import java.util.ArrayList; /** * A process may be defined as a code, with some private data, executing @@ -46,16 +46,14 @@ 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. */ - private long bind; - /** - * Indicates if the process is started - */ + private long bind = 0; + /** 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; + private static long nextProcessId = 0; /** * Even if this attribute is public you must never access to it. @@ -66,34 +64,27 @@ public abstract class Process implements Runnable { /** Time at which the process should be created */ protected double startTime = 0; - /** Time at which th - * Kill time of the process + /** Time at which the process should be killed. * * Set at creation, and used internally by SimGrid */ private double killTime = -1; - private String name; + private String name = null; private int pid = -1; private int ppid = -1; private Host host = null; - /** The arguments of the method function of the process. */ - public Vector args; + /** The arguments of the method function of the process. */ + private ArrayList args = new ArrayList<>(); - /** - * Default constructor - */ + /** Default constructor */ protected Process() { this.id = nextProcessId++; - this.name = null; - this.bind = 0; - this.args = new Vector(); } - /** * Constructs a new process from the name of a host and his name. The method * function of the process doesn't have argument. @@ -117,11 +108,9 @@ public abstract class Process implements Runnable { * @param args The arguments of the main function of the process. * * @exception HostNotFoundException if no host with this name exists. - * NativeException - * @throws NativeException * */ - public Process(String hostname, String name, String args[]) throws HostNotFoundException, NativeException { + public Process(String hostname, String name, String[] args) throws HostNotFoundException { this(Host.getByName(hostname), name, args); } /** @@ -146,14 +135,16 @@ public abstract class Process implements Runnable { public Process(Host host, String name, String[]args) { this(); this.host = host; + if (host == null) + throw new NullPointerException("Host cannot be NULL"); if (name == null) throw new NullPointerException("Process name cannot be NULL"); this.name = name; - this.args = new Vector(); + this.args = new ArrayList<>(); if (null != args) this.args.addAll(Arrays.asList(args)); - } + } /** * Constructs a new process from a host and his name, the arguments of here method function are * specified by the parameter args. @@ -166,18 +157,9 @@ public abstract class Process implements Runnable { * */ public Process(Host host, String name, String[]args, double startTime, double killTime) { - this(); - this.host = host; - if (name == null) - throw new NullPointerException("Process name cannot be NULL"); - this.name = name; - - this.args = new Vector(); - if (null != args) - this.args.addAll(Arrays.asList(args)); - + this(host, name, args); this.startTime = startTime; - this.killTime = killTime; + this.killTime = killTime; } /** * The natively implemented method to create an MSG process. @@ -201,6 +183,9 @@ public abstract class Process implements Runnable { * SimGrid sometimes have issues when you kill processes that are currently communicating and such. We are working on it to fix the issues. */ public native void kill(); + public static void kill(Process p) { + p.kill(); + } /** Suspends the process. See {@link #resume()} to resume it afterward */ public native void suspend(); @@ -208,10 +193,14 @@ public abstract class Process implements Runnable { public native void resume(); /** Tests if a process is suspended. * - * @see {@link #suspend()} and {@link #resume()} - */ + * @see #suspend() + * @see #resume() + */ public native boolean isSuspended(); + /** Yield the current process. All other processes that are ready at the same timestamp will be executed first */ + public static native void yield(); + /** * Specify whether the process should restart when its host restarts after a failure * @@ -240,10 +229,8 @@ public abstract class Process implements Runnable { * @param PID The process identifier of the process to get. * * @return The process with the specified PID. - * - * @exception NativeException on error in the native SimGrid code */ - public static native Process fromPID(int PID) throws NativeException; + public static native Process fromPID(int PID); /** * This method returns the PID of the process. * @@ -288,7 +275,7 @@ public abstract class Process implements Runnable { */ public native void migrate(Host host); /** - * Makes the current process sleep until millis millisecondes have elapsed. + * Makes the current process sleep until millis milliseconds have elapsed. * You should note that unlike "waitFor" which takes seconds, this method takes milliseconds. * FIXME: Not optimal, maybe we should have two native functions. * @param millis the length of time to sleep in milliseconds. @@ -303,9 +290,9 @@ public abstract class Process implements Runnable { * milliseconds and nanoseconds. * Overloads Thread.sleep. * @param millis the length of time to sleep in milliseconds. - * @param nanos additionnal nanoseconds to sleep. + * @param nanos additional nanoseconds to sleep. */ - public native static void sleep(long millis, int nanos) throws HostFailureException; + public static native 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. @@ -323,29 +310,28 @@ public abstract class Process implements Runnable { } } - /** - * This method runs the process. Il calls the method function that you must overwrite. - */ + /** This method runs the process. Il calls the method function that you must overwrite. */ + @Override public void run() { String[] args = null; /* do not fill it before the signal or this.args will be empty */ - //waitSignal(); /* wait for other people to fill the process in */ try { args = new String[this.args.size()]; - if (this.args.size() > 0) { + if (!this.args.isEmpty()) { this.args.toArray(args); } this.main(args); - } catch(MsgException e) { + } + catch(MsgException e) { e.printStackTrace(); Msg.info("Unexpected behavior. Stopping now"); System.exit(1); } catch(ProcessKilledError pk) { + /* The process was killed before its end. With a kill() or something. */ } - exit(); } /** @@ -356,13 +342,16 @@ public abstract class Process implements Runnable { */ public abstract void main(String[]args) throws MsgException; - public native void exit(); + /** Stops the execution of the current actor */ + public void exit() { + this.kill(); + } /** * Class initializer, to initialize various JNI stuff */ private static native void nativeInit(); static { - Msg.nativeInit(); + org.simgrid.NativeLib.nativeInit(); nativeInit(); } /** @@ -370,6 +359,6 @@ public abstract class Process implements Runnable { * * @return The count of the running processes */ - public native static int getCount(); + public static native int getCount(); }