deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

lower simulation thread priority, added timeout on blocking stop simulation method

Browse source
This commit is contained in:
fros4943 2010-03-26 09:26:22 +00:00
parent e4c3ac8125
commit 96979b5fbf
1 changed files with 23 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
tools/cooja/java/se/sics/cooja/Simulation.java
View file

@ -24,7 +24,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
* *
* $Id: Simulation.java,v 1.63 2010/02/23 21:55:55 fros4943 Exp $ * $Id: Simulation.java,v 1.64 2010/03/26 09:26:22 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -310,14 +310,15 @@ public class Simulation extends Observable implements Runnable {
if (!isRunning()) { if (!isRunning()) {
isRunning = true; isRunning = true;
simulationThread = new Thread(this); simulationThread = new Thread(this);
simulationThread.setPriority(Thread.MIN_PRIORITY);
simulationThread.start(); simulationThread.start();
} }
} }
/** /**
* Stops simulation and conditionally blocks until stopped. * Stop simulation
* *
* @param block Blocks if true * @param block Block until simulation has stopped, with timeout (100ms)
* *
* @see #stopSimulation() * @see #stopSimulation()
*/ */
@ -325,32 +326,32 @@ public class Simulation extends Observable implements Runnable {
if (!isRunning()) { if (!isRunning()) {
return; return;
} }
stopSimulation = true;
if (block) { if (block) {
stopSimulation(); if (Thread.currentThread() == simulationThread) {
} else { return;
stopSimulation = true; }
/* Wait until simulation stops */
try {
Thread simThread = simulationThread;
if (simThread != null) {
simThread.join(100);
}
} catch (InterruptedException e) {
}
} }
} }
/** /**
* Stops this simulation (notifies observers). * Stop simulation (blocks).
* Method blocks until simulation has stopped. * Calls stopSimulation(true).
*
* @see #stopSimulation(boolean)
*/ */
public void stopSimulation() { public void stopSimulation() {
if (isRunning()) { stopSimulation(true);
stopSimulation = true;
/* Wait until simulation stops */
if (Thread.currentThread() != simulationThread) {
try {
Thread simThread = simulationThread;
if (simThread != null) {
simThread.join();
}
} catch (InterruptedException e) {
}
}
}
} }
/** /**