bugfix: clock drift must be set even when the random startup delay is zero
This commit is contained in:
parent
91e762b7bc
commit
d13f47a64f
|
@ -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.51 2009/07/06 12:29:57 fros4943 Exp $
|
* $Id: Simulation.java,v 1.52 2009/08/20 13:10:35 fros4943 Exp $
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package se.sics.cooja;
|
package se.sics.cooja;
|
||||||
|
@ -688,11 +688,15 @@ public class Simulation extends Observable implements Runnable {
|
||||||
* Mote to add
|
* Mote to add
|
||||||
*/
|
*/
|
||||||
public void addMote(final Mote mote) {
|
public void addMote(final Mote mote) {
|
||||||
if (maxMoteStartupDelay > 0 && mote.getInterfaces().getClock() != null) {
|
if (mote.getInterfaces().getClock() != null) {
|
||||||
|
if (maxMoteStartupDelay > 0) {
|
||||||
mote.getInterfaces().getClock().setDrift(
|
mote.getInterfaces().getClock().setDrift(
|
||||||
- getSimulationTime()
|
- getSimulationTime()
|
||||||
- randomGenerator.nextInt((int)maxMoteStartupDelay)
|
- randomGenerator.nextInt((int)maxMoteStartupDelay)
|
||||||
);
|
);
|
||||||
|
} else {
|
||||||
|
mote.getInterfaces().getClock().setDrift(-getSimulationTime());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!isRunning()) {
|
if (!isRunning()) {
|
||||||
|
|
Loading…
Reference in a new issue