Merge branch 'master' of git://scm.gforge.inria.fr/simgrid/simgrid-java

diff --git a/ChangeLog b/ChangeLog
index 3fde49a..ef7fd9f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
 SimGrid-java (3.6.1) unstable; urgency=low
+ * Make Process.kill(process) an instance method, not a static one
  * Fix a bug around Process.kill()
  * Add dsend and simulatedSleep to the bindings.
 

diff --git a/examples/master_slave_kill/Master.java b/examples/master_slave_kill/Master.java
index e3dc16e..0600913 100644 (file)
--- a/examples/master_slave_kill/Master.java
+++ b/examples/master_slave_kill/Master.java
@@ -41,7 +41,7 @@ public class Master extends Process {
                                }
                }
                
-               Process.kill(process2);
+               process2.kill();
 
                Msg.info("Process2 is now killed, should exit now");
        }

diff --git a/org/simgrid/msg/Process.java b/org/simgrid/msg/Process.java
index bae4db2..0f513d1 100644 (file)
--- a/org/simgrid/msg/Process.java
+++ b/org/simgrid/msg/Process.java
@@ -244,23 +244,11 @@ public abstract class Process extends Thread {
         * @param process  the process to be killed.
         *
         */
-       public static void kill(Process process) {
-                process.nativeStop();
-                Msg.info("Process " + process.msgName() + " will be killed.");                         
+       public void kill() {
+                nativeStop();
+                Msg.info("Process " + msgName() + " will be killed.");                         
                                 
        }
-       /**
-        * This method adds an argument in the list of the arguments of the main function
-        * of the process. 
-        *
-        * @param arg                   The argument to add.
-     *
-     * @deprecated
-     */
-       @Deprecated
-       protected void addArg(String arg) {
-               args.add(arg);
-       }
 
        /**
         * Suspends the process by suspending the task on which it was