[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/collection ForwardingEngineP.nc, 1.1.2.21, 1.1.2.22

[Rodrigo Fonseca]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	ForwardingEngineP.nc 
Log Message:
Added a number of UART debug messages


Index: ForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/Attic/ForwardingEngineP.nc,v
retrieving revision 1.1.2.21
retrieving revision 1.1.2.22
diff -C2 -d -r1.1.2.21 -r1.1.2.22
*** ForwardingEngineP.nc	15 Jun 2006 17:20:08 -0000	1.1.2.21
--- ForwardingEngineP.nc	16 Jun 2006 12:59:59 -0000	1.1.2.22
***************
*** 253,256 ****
--- 253,257 ----
  	else {
  	  dbg("Forwarder", "%s: forwarded packet.\n", __FUNCTION__);
+           call CollectionDebug.logEventRoute(NET_C_FE_FWD_MSG, 0xaa, TOS_NODE_ID, dest);
  	}
          return;
***************
*** 301,304 ****
--- 302,306 ----
        // Retry in 512-1023 ms
        uint16_t r = call Random.rand16();
+       call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_FAIL, error, TOS_NODE_ID, call AMPacket.destination(msg));
        r &= 0x1ff;
        r += 512;
***************
*** 311,314 ****
--- 313,317 ----
        // Retry in 128-255ms
        uint16_t r = call Random.rand16();
+       call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_WAITACK, error, TOS_NODE_ID, call AMPacket.destination(msg));
        r &= 0x7f;
        r += 128;
***************
*** 320,323 ****
--- 323,327 ----
        uint8_t client = qe->client;
        dbg("Forwarder", "%s: our packet for client %hhu, remove %p from queue\n", __FUNCTION__, client, qe);
+       call CollectionDebug.logEventRoute(NET_C_FE_SENT_MSG, error, TOS_NODE_ID, call AMPacket.destination(msg));
        clientPtrs[client] = qe;
        hdr = getHeader(qe->msg);
***************
*** 330,333 ****
--- 334,338 ----
        // 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 CollectionDebug.logEventRoute(NET_C_FE_FWD_MSG, error, TOS_NODE_ID, call AMPacket.destination(msg));
        call SendQueue.dequeue();
        call MessagePool.put(qe->msg);
***************
*** 392,395 ****
--- 397,401 ----
      collection_id_t collectid;
      collectid = hdr->collectid;
+     call CollectionDebug.logEvent(NET_C_FE_RCV_MSG);
      if (len > call SubSend.maxPayloadLength()) {
        return msg;