[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/collection CollectionC.nc, 1.1.2.2, 1.1.2.3 ForwardingEngineP.nc, 1.1.2.49, 1.1.2.50 TreeRoutingEngineP.nc, 1.1.2.20, 1.1.2.21

[Omprakash Gnawali]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CollectionC.nc ForwardingEngineP.nc TreeRoutingEngineP.nc 
Log Message:
changes in the linkestimator so that we use data transmission success/failure information to estimate the etx as well as beacons

Index: CollectionC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/CollectionC.nc,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -d -r1.1.2.2 -r1.1.2.3
*** CollectionC.nc	26 May 2006 00:25:55 -0000	1.1.2.2
--- CollectionC.nc	5 Oct 2006 08:08:18 -0000	1.1.2.3
***************
*** 51,54 ****
--- 51,55 ----
    ForwardingEngineP.BasicRouting -> TreeRoutingEngineP;
    TreeRoutingEngineP.LinkEstimator -> LinkEstimatorC;
+   ForwardingEngineP.LinkEstimator -> LinkEstimatorC;
    
    components new LinkEstimatorAMSenderC(AM_COLLECTION_DATA) 

Index: ForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/ForwardingEngineP.nc,v
retrieving revision 1.1.2.49
retrieving revision 1.1.2.50
diff -C2 -d -r1.1.2.49 -r1.1.2.50
*** ForwardingEngineP.nc	25 Aug 2006 00:41:28 -0000	1.1.2.49
--- ForwardingEngineP.nc	5 Oct 2006 08:08:18 -0000	1.1.2.50
***************
*** 157,160 ****
--- 157,161 ----
      interface AMPacket;
      interface CollectionDebug;
+     interface LinkEstimator;
      interface Leds;
    }
***************
*** 502,505 ****
--- 503,509 ----
      }
      else if (ackPending && !call PacketAcknowledgements.wasAcked(msg)) {
+ 
+       call LinkEstimator.txNoAck(AMPacket.destination(msg));
+ 
        // AckPending is for case when DL cannot support acks.
        if (--qe->retries) { 
***************
*** 553,556 ****
--- 557,563 ----
        // A successfully forwarded packet.
        dbg("Forwarder,Route", "%s: successfully forwarded packet (client: %hhu), message pool is %hhu/%hhu.\n", __FUNCTION__, qe->client, call MessagePool.size(), call MessagePool.maxSize());
+ 
+       call LinkEstimator.txAck(AMPacket.destination(msg));
+ 
        call CollectionDebug.logEventMsg(NET_C_FE_FWD_MSG, 
  					 call CollectionPacket.getSequenceNumber(msg), 

Index: TreeRoutingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/TreeRoutingEngineP.nc,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -C2 -d -r1.1.2.20 -r1.1.2.21
*** TreeRoutingEngineP.nc	25 Aug 2006 00:41:28 -0000	1.1.2.20
--- TreeRoutingEngineP.nc	5 Oct 2006 08:08:18 -0000	1.1.2.21
***************
*** 296,299 ****
--- 296,300 ----
                  call LinkEstimator.unpinNeighbor(routeInfo.parent);
                  call LinkEstimator.pinNeighbor(best->neighbor);
+ 		call LinkEstimator.clearDLQ(best->neighbor);
                  atomic {
                      routeInfo.parent = best->neighbor;