Added randomization to timers for better testing.

Adjusted test script to run a single node longer.

diff --git a/apps/tests/TestTrickleTimer/TestTrickleTimerAppC.nc b/apps/tests/TestTrickleTimer/TestTrickleTimerAppC.nc
index b2e3f776d431d5e781af752db355e31637e48449..ca39ca0814c5579b336fe0c795a64e5bb1b67418 100644 (file)
--- a/apps/tests/TestTrickleTimer/TestTrickleTimerAppC.nc
+++ b/apps/tests/TestTrickleTimer/TestTrickleTimerAppC.nc
@@ -39,7 +39,7 @@ implementation {
   components new TimerMilliC();
   components new BitVectorC(1) as PendingVector;
   components new BitVectorC(1) as ChangeVector;
-
+  
   //  Timer.Timer -> TimerMilliC;
   //Timer.Random -> RandomC;
   //Timer.Changed -> ChangeVector;
@@ -52,7 +52,7 @@ implementation {
   TestTrickleTimerAppP.TimerB -> TimerB;
   TestTrickleTimerAppP.TimerC -> TimerC;
   TestTrickleTimerAppP.TimerD -> TimerD;
-  
+  TestTrickleTimerAppP.Random -> RandomC;
 }
 
   

diff --git a/apps/tests/TestTrickleTimer/TestTrickleTimerAppP.nc b/apps/tests/TestTrickleTimer/TestTrickleTimerAppP.nc
index 35d872776fefd52ce0b7e3e5909bdac41a21a70d..0b456e97365ecd934a7b9549b4eb83b82a8ca8d4 100644 (file)
--- a/apps/tests/TestTrickleTimer/TestTrickleTimerAppP.nc
+++ b/apps/tests/TestTrickleTimer/TestTrickleTimerAppP.nc
@@ -36,6 +36,7 @@ module TestTrickleTimerAppP {
     interface TrickleTimer as TimerB;
     interface TrickleTimer as TimerC;
     interface TrickleTimer as TimerD;
+    interface Random;
   }
 }
 implementation {
@@ -82,17 +83,17 @@ implementation {
     }
   }
 
-  uint8_t i = 0;
+  uint16_t i = 0;
   event void TimerD.fired() {
     dbg("TestTrickle", "Timer D fired at %s\n", sim_time_string());
-    i++;
-    i = i % 3;
+    i = call Random.rand16();
+    i = i % 4;
     switch (i) {
     case 0:
-      //      call TimerA.reset();
+      call TimerA.reset();
       break;
     case 1:
-      //      call TimerB.reset();
+      call TimerB.reset();
       break;
     case 2:
       call TimerC.reset();

diff --git a/apps/tests/TestTrickleTimer/test.py b/apps/tests/TestTrickleTimer/test.py
index 9523a3fc7f6ec084477994b2d93a29cc097afec8..549f8b8207fdf9f334a1aaf0c32f8b4d356c45a5 100644 (file)
--- a/apps/tests/TestTrickleTimer/test.py
+++ b/apps/tests/TestTrickleTimer/test.py
@@ -5,11 +5,11 @@ t = Tossim([]);
 t.init()
 t.addChannel("Trickle", sys.stdout);
 
-for i in range(0, 10):
+for i in range(0, 1):
     m = t.getNode(i)
     m.bootAtTime(i * 5023211 + 10002322)
 
-for i in range(0, 100):
+for i in range(0, 1000000):
     t.runNextEvent()