[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/lqi Collection.h, 1.1, 1.2 CollectionC.nc, 1.3, 1.4 LqiForwardingEngineP.nc, 1.4, 1.5 MultiHopEngineM.nc, 1.2, 1.3 MultiHopLqi.h, 1.2, 1.3 RouteControl.nc, 1.2, 1.3 RouteSelect.nc, 1.2, 1.3

[Phil Levis]

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

Modified Files:
	Collection.h CollectionC.nc LqiForwardingEngineP.nc 
	MultiHopEngineM.nc MultiHopLqi.h RouteControl.nc 
	RouteSelect.nc 
Log Message:
Change logging slightly.



Index: CollectionC.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/lqi/CollectionC.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** CollectionC.nc	13 Apr 2007 00:10:48 -0000	1.3
--- CollectionC.nc	13 Apr 2007 21:45:25 -0000	1.4
***************
*** 48,51 ****
--- 48,52 ----
      interface CollectionPacket;
      interface RootControl;
+     interface RouteControl;
    }
    uses interface CollectionDebug;
***************
*** 57,60 ****
--- 58,63 ----
    components new SendVirtualizerP(NUM_LQI_CLIENTS);
    
+   RouteControl = Router;
+ 
    Send =        SendVirtualizerP;
    SendVirtualizerP.SubSend -> Router.Send;

Index: LqiForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/lqi/LqiForwardingEngineP.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** LqiForwardingEngineP.nc	13 Apr 2007 19:38:11 -0000	1.4
--- LqiForwardingEngineP.nc	13 Apr 2007 21:45:25 -0000	1.5
***************
*** 1,5 ****
  // $Id$
  
- 
  /* Copyright (c) 2007 Stanford University.
   * All rights reserved.
--- 1,4 ----
***************
*** 261,264 ****
--- 260,268 ----
      len -= sizeof(lqi_header_t);
  
+     call CollectionDebug.logEventMsg(NET_C_FE_RCV_MSG, 
+ 				     call CollectionPacket.getTestNetworkSeq(msg), 
+ 				     call CollectionPacket.getOrigin(msg), 
+ 				     call AMPacket.destination(msg));
+ 
      if (call RootControl.isRoot()) {
        dbg("LQI,LQIDeliver", "LQI Root is receiving packet from node %hu @%s\n", getHeader(msg)->originaddr, sim_time_string());
***************
*** 299,303 ****
  	dbg("LQI", "Packet not acked, retransmit @%s:\n\t%s\n", sim_time_string(), fields(msg));
          call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
--- 303,307 ----
  	dbg("LQI", "Packet not acked, retransmit @%s:\n\t%s\n", sim_time_string(), fields(msg));
          call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK, 
! 					 call CollectionPacket.getTestNetworkSeq(msg), 
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
***************
*** 306,310 ****
        } else {
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
--- 310,314 ----
        } else {
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL, 
! 					 call CollectionPacket.getTestNetworkSeq(msg), 
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
***************
*** 316,320 ****
      else if (fail_count >= 5) {
        call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL_ACK_FWD, 
! 				       call CollectionPacket.getSequenceNumber(msg), 
  				       call CollectionPacket.getOrigin(msg), 
  				       call AMPacket.destination(msg));
--- 320,324 ----
      else if (fail_count >= 5) {
        call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL_ACK_FWD, 
! 				       call CollectionPacket.getTestNetworkSeq(msg), 
  				       call CollectionPacket.getOrigin(msg), 
  				       call AMPacket.destination(msg));
***************
*** 324,328 ****
        dbg("LQI", "Packet acked:\t%s\n", fields(msg));
        call CollectionDebug.logEventMsg(NET_C_FE_FWD_MSG, 
! 				       call CollectionPacket.getSequenceNumber(msg), 
  				       call CollectionPacket.getOrigin(msg), 
  				       call AMPacket.destination(msg));
--- 328,332 ----
        dbg("LQI", "Packet acked:\t%s\n", fields(msg));
        call CollectionDebug.logEventMsg(NET_C_FE_FWD_MSG, 
! 				       call CollectionPacket.getTestNetworkSeq(msg), 
  				       call CollectionPacket.getOrigin(msg), 
  				       call AMPacket.destination(msg));
***************
*** 356,360 ****
  	dbg("LQI", "Packet not acked, retransmit (%hhu) @%s:\n\t%s\n", fail_count, sim_time_string(), fields(msg));
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
--- 360,364 ----
  	dbg("LQI", "Packet not acked, retransmit (%hhu) @%s:\n\t%s\n", fail_count, sim_time_string(), fields(msg));
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_WAITACK, 
! 					 call CollectionPacket.getTestNetworkSeq(msg), 
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
***************
*** 363,367 ****
        } else {
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
--- 367,371 ----
        } else {
  	call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL, 
! 					 call CollectionPacket.getTestNetworkSeq(msg), 
  					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
***************
*** 373,377 ****
      else if (fail_count >= 5) {
        call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL_ACK_SEND, 
! 				       call CollectionPacket.getSequenceNumber(msg), 
  				       call CollectionPacket.getOrigin(msg), 
  				       call AMPacket.destination(msg));
--- 377,381 ----
      else if (fail_count >= 5) {
        call CollectionDebug.logEventMsg(NET_C_FE_SENDDONE_FAIL_ACK_SEND, 
! 				       call CollectionPacket.getTestNetworkSeq(msg), 
  				       call CollectionPacket.getOrigin(msg), 
  				       call AMPacket.destination(msg));
***************
*** 381,385 ****
        dbg("LQI", "Packet acked:\t%s\n", fields(msg));
        call CollectionDebug.logEventMsg(NET_C_FE_SENT_MSG, 
! 				       call CollectionPacket.getSequenceNumber(msg), 
  				       call CollectionPacket.getOrigin(msg), 
  				       call AMPacket.destination(msg));
--- 385,389 ----
        dbg("LQI", "Packet acked:\t%s\n", fields(msg));
        call CollectionDebug.logEventMsg(NET_C_FE_SENT_MSG, 
! 				       call CollectionPacket.getTestNetworkSeq(msg), 
  				       call CollectionPacket.getOrigin(msg), 
  				       call AMPacket.destination(msg));
***************
*** 500,503 ****
--- 504,514 ----
      hdr->originseqno = seqno;
    }
+ 
+   command uint16_t CollectionPacket.getTestNetworkSeq(message_t* msg) {
+     TestNetworkMsg *tn;
+     tn = (TestNetworkMsg *)call Packet.getPayload(msg, NULL);
+     return tn->seqno;
+   }
+ 
    
   default event void Send.sendDone(message_t* pMsg, error_t success) {}