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

default random mote startup time set to 1sec + handling msp mote breakpoints

Browse source
This commit is contained in:
fros4943 2008-09-29 23:04:27 +00:00
parent 4ea174d31a
commit f150cab154
1 changed files with 10 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
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.23 2008/09/22 16:18:22 joxe Exp $ * $Id: Simulation.java,v 1.24 2008/09/29 23:04:27 fros4943 Exp $
*/ */
package se.sics.cooja; package se.sics.cooja;
@ -82,7 +82,7 @@ public class Simulation extends Observable implements Runnable {
private int nrTickLists = 1; private int nrTickLists = 1;
private int maxMoteStartupDelay = 0; private int maxMoteStartupDelay = 1000;
private Random tickListRandom = new Random(); private Random tickListRandom = new Random();
@ -216,20 +216,14 @@ public class Simulation extends Observable implements Runnable {
} }
} catch (InterruptedException e) { } catch (InterruptedException e) {
isRunning = false; logger.warn("InterruptedException:" + e);
thread = null; } catch (IllegalArgumentException e) {
// break; logger.warn("llegalArgumentException:" + e);
} catch (IllegalArgumentException e) { } catch (IllegalMonitorStateException e) {
logger.warn("llegalArgumentException:" + e); logger.warn("IllegalMonitorStateException:" + e);
isRunning = false; } catch (RuntimeException e) {
thread = null; logger.warn("Simulation stop requested");
// break; }
} catch (IllegalMonitorStateException e) {
logger.warn("IllegalMonitorStateException:" + e);
isRunning = false;
thread = null;
// break;
}
isRunning = false; isRunning = false;
thread = null; thread = null;
stopSimulation = false; stopSimulation = false;