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

removed unused currentSimTime + fixed bug when nodes are added during simulations

Browse source
This commit is contained in:
fros4943 2008-10-07 16:49:21 +00:00
parent 11a084f8df
commit 6011abbb79
1 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
tools/cooja/apps/mspsim/src/se/sics/cooja/mspmote/MspMote.java
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: MspMote.java,v 1.12 2008/09/22 16:18:48 joxe Exp $
* $Id: MspMote.java,v 1.13 2008/10/07 16:49:21 fros4943 Exp $
*/
package se.sics.cooja.mspmote;
@ -261,25 +261,23 @@ public abstract class MspMote implements Mote {
*/
protected abstract boolean initEmulator(File ELFFile);
private int currentSimTime = -1;
/* return false when done - e.g. true means more work to do before finished with this tick */
private boolean firstTick = true;
public boolean tick(int simTime) {
if (stopNextInstruction) {
stopNextInstruction = false;
throw new RuntimeException("Request simulation stop");
}
if (currentSimTime < 0) {
currentSimTime = simTime;
/* Nodes may be added in an ongoing simulation:
* Update cycle drift to current simulation time */
if (firstTick) {
firstTick = false;
cycleDrift += (-NR_CYCLES_PER_MSEC*simTime);
}
if (currentSimTime != simTime) {
currentSimTime = simTime;
}
long maxSimTimeCycles = NR_CYCLES_PER_MSEC*(simTime+1);
if (maxSimTimeCycles <= cycleCounter - cycleDrift) {
long maxSimTimeCycles = NR_CYCLES_PER_MSEC*(simTime+1) + cycleDrift;
if (maxSimTimeCycles <= cycleCounter) {
return false;
}
@ -292,7 +290,7 @@ public abstract class MspMote implements Mote {
return true;
}
myMoteInterfaceHandler.doActiveActionsBeforeTick();
cpu.step(cycleCounter);
/* Check if radio has pending incoming bytes */