[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/ctp CtpForwardingEngineP.nc, 1.1.2.8, 1.1.2.9 CtpP.nc, 1.1.2.5, 1.1.2.6

[Omprakash Gnawali]

Update of /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv26347/ctp

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CtpForwardingEngineP.nc CtpP.nc 
Log Message:
catch evicted event, change the CTP forwarding engine to use the new link estimator

Index: CtpForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/Attic/CtpForwardingEngineP.nc,v
retrieving revision 1.1.2.8
retrieving revision 1.1.2.9
diff -C2 -d -r1.1.2.8 -r1.1.2.9
*** CtpForwardingEngineP.nc	13 Sep 2006 01:41:57 -0000	1.1.2.8
--- CtpForwardingEngineP.nc	5 Oct 2006 21:44:52 -0000	1.1.2.9
***************
*** 151,154 ****
--- 151,156 ----
      interface Timer<TMilli> as RetxmitTimer;
  
+     interface LinkEstimator;
+ 
      // Counts down from the last time we heard from our parent; used
      // to expire local state about parent congestion.
***************
*** 524,527 ****
--- 526,530 ----
      else if (ackPending && !call PacketAcknowledgements.wasAcked(msg)) {
        // AckPending is for case when DL cannot support acks.
+       call LinkEstimator.txNoAck(call AMPacket.destination(msg));
        if (--qe->retries) { 
          dbg("Forwarder", "%s: not acked\n", __FUNCTION__);
***************
*** 564,567 ****
--- 567,571 ----
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
+       call LinkEstimator.txAck(call AMPacket.destination(msg));
        clientPtrs[client] = qe;
        hdr = getHeader(qe->msg);
***************
*** 578,581 ****
--- 582,586 ----
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
+       call LinkEstimator.txAck(call AMPacket.destination(msg));
        call SentCache.insert(qe->msg);
        call SendQueue.dequeue();
***************
*** 932,935 ****
--- 937,945 ----
    }
  
+   /* signalled when this neighbor is evicted from the neighbor table */
+   event void LinkEstimator.evicted(am_addr_t neighbor) {
+   }
+ 
+ 
    /* Default implementations for CollectionDebug calls.
     * These allow CollectionDebug not to be wired to anything if debugging

Index: CtpP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/Attic/CtpP.nc,v
retrieving revision 1.1.2.5
retrieving revision 1.1.2.6
diff -C2 -d -r1.1.2.5 -r1.1.2.6
*** CtpP.nc	13 Sep 2006 01:41:57 -0000	1.1.2.5
--- CtpP.nc	5 Oct 2006 21:44:53 -0000	1.1.2.6
***************
*** 123,126 ****
--- 123,127 ----
    components new TimerMilliC() as RouteUpdateTimer;
    components LinkEstimatorP as Estimator;
+   Forwarder.LinkEstimator -> Estimator;
  
    components new AMSenderC(AM_CTP_DATA);