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

add new motes without stopping simulation: from timevent invoked by simulation loop

Browse source 
enables test scripts to add new motes
This commit is contained in:
fros4943 2009-02-18 15:57:47 +00:00
parent 472ecf2120
commit d458fe79b5
1 changed files with 39 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

64
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.38 2009/02/18 10:09:59 fros4943 Exp $ * $Id: Simulation.java,v 1.39 2009/02/18 15:57:47 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -189,6 +189,21 @@ public class Simulation extends Observable implements Runnable {
} }
}; };
private void recreateTickLists() {
/* Tick MSP motes separately */
ArrayList<Mote> mspMotes = new ArrayList<Mote>();
ArrayList<Mote> contikiMotes = new ArrayList<Mote>();
for (Mote mote: motes) {
if (mote.getType().getClass().toString().contains(".mspmote.")) {
mspMotes.add(mote);
} else {
contikiMotes.add(mote);
}
}
mspMoteArray = mspMotes.toArray(new Mote[mspMotes.size()]);
moteArray = contikiMotes.toArray(new Mote[contikiMotes.size()]);
}
private boolean rescheduleEvents = false; private boolean rescheduleEvents = false;
public void run() { public void run() {
long lastStartTime = System.currentTimeMillis(); long lastStartTime = System.currentTimeMillis();
@ -204,18 +219,7 @@ public class Simulation extends Observable implements Runnable {
this.setChanged(); this.setChanged();
this.notifyObservers(this); this.notifyObservers(this);
/* Tick MSP motes separately */ recreateTickLists();
ArrayList<Mote> mspMotes = new ArrayList<Mote>();
ArrayList<Mote> contikiMotes = new ArrayList<Mote>();
for (Mote mote: motes) {
if (mote.getType().getClass().toString().contains(".mspmote.")) {
mspMotes.add(mote);
} else {
contikiMotes.add(mote);
}
}
mspMoteArray = mspMotes.toArray(new Mote[mspMotes.size()]);
moteArray = contikiMotes.toArray(new Mote[contikiMotes.size()]);
boolean increasedTime; boolean increasedTime;
try { try {
@ -621,24 +625,34 @@ public class Simulation extends Observable implements Runnable {
* @param mote * @param mote
* Mote to add * Mote to add
*/ */
public void addMote(Mote mote) { public void addMote(final Mote mote) {
if (isRunning()) {
stopSimulation();
motes.add(mote);
startSimulation();
} else {
motes.add(mote);
}
if (maxMoteStartupDelay > 0 && mote.getInterfaces().getClock() != null) { if (maxMoteStartupDelay > 0 && mote.getInterfaces().getClock() != null) {
mote.getInterfaces().getClock().setDrift( mote.getInterfaces().getClock().setDrift(
-randomGenerator.nextInt(maxMoteStartupDelay) -randomGenerator.nextInt(maxMoteStartupDelay)
); );
} }
currentRadioMedium.registerMote(mote, this); if (!isRunning()) {
this.setChanged(); /* Simulation is stopped, add mote immediately */
this.notifyObservers(this); motes.add(mote);
currentRadioMedium.registerMote(mote, this);
this.setChanged();
this.notifyObservers(this);
return;
}
/* Simulation is running, add mote in simulation loop */
TimeEvent addNewMoteEvent = new TimeEvent(0) {
public void execute(long t) {
motes.add(mote);
currentRadioMedium.registerMote(mote, Simulation.this);
recreateTickLists();
Simulation.this.setChanged();
Simulation.this.notifyObservers(this);
}
};
scheduleEvent(addNewMoteEvent, Simulation.this.getSimulationTime());
} }
/** /**