From 1982dc225f0f0b1c4280d5662eecb70a2de6ac35 Mon Sep 17 00:00:00 2001 From: Martin Quinson Date: Thu, 26 Apr 2012 18:20:48 +0200 Subject: [PATCH 1/1] Make Process.kill(process) an instance method, not a static one It feels more OOP this way, AMHA. --- ChangeLog | 1 + examples/master_slave_kill/Master.java | 2 +- org/simgrid/msg/Process.java | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3fde49ac75..ef7fd9f919 100644 --- 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 e3dc16e2e1..0600913cb7 100644 --- 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 d2d657e589..34a9870278 100644 --- a/org/simgrid/msg/Process.java +++ b/org/simgrid/msg/Process.java @@ -231,9 +231,9 @@ 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."); } /** -- 2.20.1