X-Git-Url: https://oss.titaniummirror.com/gitweb/?p=tinyos-2.x.git;a=blobdiff_plain;f=tos%2Flib%2Fnet%2FTrickleTimerImplP.nc;h=12e9d5bd2a5deefc667015dfd3c772ae8754b29b;hp=68ffc4669263593dff6ecbd696620fe261e09929;hb=e9bfab607e051bae6afb47b44892ce37541d1b44;hpb=adf1de6c009d13b7b52e68535c63b28f59c97400

diff --git a/tos/lib/net/TrickleTimerImplP.nc b/tos/lib/net/TrickleTimerImplP.nc
index 68ffc466..12e9d5bd 100644
--- a/tos/lib/net/TrickleTimerImplP.nc
+++ b/tos/lib/net/TrickleTimerImplP.nc
@@ -168,7 +168,7 @@ implementation {
   event void Timer.fired() {
     uint8_t i;
     uint32_t dt = call Timer.getdt();
-
+    dbg("Trickle", "Trickle Sub-timer fired\n");
     for (i = 0; i < count; i++) {
       uint32_t remaining = trickles[i].time;
       if (remaining != 0) {
@@ -176,11 +176,12 @@ implementation {
 	if (remaining == 0) {
 	  if (trickles[i].count < k) {
 	    atomic {
+	      dbg("Trickle", "Trickle: mark timer %hhi as pending\n", i);
 	      call Pending.set(i);
 	    }
 	    post timerTask();
 	  }
-
+	  call Changed.set(i);
 	  generateTime(i);
 	    
 	  /* Note that this logic is not the exact trickle algorithm.
@@ -191,9 +192,6 @@ implementation {
 	   */
 	  trickles[i].count = 0;
 	}
-	else {
-	  trickles[i].time = remaining;
-	}
       }
     }
     adjustTimer();
@@ -213,26 +211,42 @@ implementation {
 	
     for (i = 0; i < count; i++) {
       uint32_t timeRemaining = trickles[i].time;
-      if (timeRemaining != 0) {
-	atomic {
-	  if (!call Changed.get(i)) {
-	    call Changed.clear(i);
+      dbg("Trickle", "Adjusting: timer %hhi (%u)\n", i, timeRemaining);
+
+      if (timeRemaining == 0) { // Not running, go to next timer
+	continue;
+      }
+      
+      atomic {
+	if (!call Changed.get(i)) {
+	  if (timeRemaining > elapsed) {
+	    dbg("Trickle", "  not changed, elapse time remaining to %u.\n", trickles[i].time - elapsed);
 	    timeRemaining -= elapsed;
+	    trickles[i].time -= elapsed;
+	  }
+	  else { // Time has already passed, so fire immediately
+	    dbg("Trickle", "  not changed, ready to elapse, fire immediately\n");
+	    timeRemaining = 1;
+	    trickles[i].time = 1;
 	  }
 	}
-	if (!set) {
-	  lowest = timeRemaining;
-	  set = TRUE;
-	}
-	else if (timeRemaining < lowest) {
-	  lowest = timeRemaining;
+	else {
+	  dbg("Trickle", "  changed, fall through.\n");
+	  call Changed.clear(i);
 	}
       }
+      if (!set) {
+	lowest = timeRemaining;
+	set = TRUE;
+      }
+      else if (timeRemaining < lowest) {
+	lowest = timeRemaining;
+      }
     }
+    
     if (set) {
       uint32_t timerVal = lowest;
-      timerVal = timerVal;
-      dbg("Trickle", "Starting time with time %u.\n", timerVal);
+      dbg("Trickle", "Starting sub-timer with interval %u.\n", timerVal);
       call Timer.startOneShot(timerVal);
     }
     else {
@@ -262,7 +276,7 @@ implementation {
     rval = call Random.rand16() % (trickles[id].period << (scale - 1));
     newTime += rval;
     
-    trickles[id].remainder = (trickles[id].period << scale) - newTime;
+    trickles[id].remainder = (((uint32_t)trickles[id].period) << scale) - newTime;
     trickles[id].time += newTime;
     dbg("Trickle,TrickleTimes", "Generated time for %hhu with period %hu (%u) is %u (%i + %hu)\n", id, trickles[id].period, (uint32_t)trickles[id].period << scale, trickles[id].time, (trickles[id].period << (scale - 1)), rval);
   }