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

allow mote tick events to be removed from event queue (slightly faster execution)

Browse source
This commit is contained in:
fros4943 2008-12-04 16:52:03 +00:00
parent 37b40f99c7
commit 28f299ad87
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
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.34 2008/12/04 14:03:42 joxe Exp $ * $Id: Simulation.java,v 1.35 2008/12/04 16:52:03 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -127,6 +127,9 @@ public class Simulation extends Observable implements Runnable {
private TimeEvent tickMspMotesEvent = new TimeEvent(0) { private TimeEvent tickMspMotesEvent = new TimeEvent(0) {
public void execute(long t) { public void execute(long t) {
/*logger.info("MSP motes tick at: " + t);*/ /*logger.info("MSP motes tick at: " + t);*/
if (mspMoteArray.length == 0) {
return;
}
/* Tick MSP motes */ /* Tick MSP motes */
boolean wantMoreTicks = true; boolean wantMoreTicks = true;
@ -149,6 +152,9 @@ public class Simulation extends Observable implements Runnable {
private TimeEvent tickMotesEvent = new TimeEvent(0) { private TimeEvent tickMotesEvent = new TimeEvent(0) {
public void execute(long t) { public void execute(long t) {
/*logger.info("Contiki motes tick at: " + t);*/ /*logger.info("Contiki motes tick at: " + t);*/
if (moteArray.length == 0) {
return;
}
/* Tick Contiki motes */ /* Tick Contiki motes */
for (Mote mote : moteArray) { for (Mote mote : moteArray) {
@ -163,14 +169,15 @@ public class Simulation extends Observable implements Runnable {
private TimeEvent delayEvent = new TimeEvent(0) { private TimeEvent delayEvent = new TimeEvent(0) {
public void execute(long t) { public void execute(long t) {
/*logger.info("Delay at: " + t);*/ /*logger.info("Delay at: " + t);*/
if (delayTime == 0)
return;
if (delayTime > 0) {
try { Thread.sleep(delayTime); } catch (InterruptedException e) { } try { Thread.sleep(delayTime); } catch (InterruptedException e) { }
scheduleEvent(this, t+1); scheduleEvent(this, t+1);
} }
}
}; };
private boolean rescheduleEvents = false;
public void run() { public void run() {
long lastStartTime = System.currentTimeMillis(); long lastStartTime = System.currentTimeMillis();
logger.info("Simulation main loop started, system time: " + lastStartTime); logger.info("Simulation main loop started, system time: " + lastStartTime);
@ -200,9 +207,17 @@ public class Simulation extends Observable implements Runnable {
boolean increasedTime; boolean increasedTime;
try { try {
TimeEvent nextEvent;
while (isRunning) { while (isRunning) {
TimeEvent nextEvent = eventQueue.popFirst(); if (rescheduleEvents) {
rescheduleEvents = false;
scheduleEvent(tickMotesEvent, currentSimulationTime);
scheduleEvent(tickMspMotesEvent, currentSimulationTime);
scheduleEvent(delayEvent, currentSimulationTime);
}
nextEvent = eventQueue.popFirst();
if (nextEvent == null) { if (nextEvent == null) {
throw new RuntimeException("No more events"); throw new RuntimeException("No more events");
} }
@ -652,7 +667,7 @@ public class Simulation extends Observable implements Runnable {
public void setDelayTime(int delayTime) { public void setDelayTime(int delayTime) {
this.delayTime = delayTime; this.delayTime = delayTime;
scheduleEvent(delayEvent, currentSimulationTime); rescheduleEvents = true;
this.setChanged(); this.setChanged();
this.notifyObservers(this); this.notifyObservers(this);