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

[Rodrigo Fonseca]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	ForwardingEngineP.nc 
Log Message:
Changed debug statements


Index: ForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/collection/Attic/ForwardingEngineP.nc,v
retrieving revision 1.1.2.33
retrieving revision 1.1.2.34
diff -C2 -d -r1.1.2.33 -r1.1.2.34
*** ForwardingEngineP.nc	22 Jun 2006 14:09:47 -0000	1.1.2.33
--- ForwardingEngineP.nc	22 Jun 2006 17:05:24 -0000	1.1.2.34
***************
*** 322,326 ****
        // Immediate retransmission is the worst thing to do.
        dbg("Forwarder", "%s: send failed\n", __FUNCTION__);
!       call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_FAIL, error, TOS_NODE_ID, 
                                           call AMPacket.destination(msg));
        startRetxmitTimer(SENDDONE_FAIL_WINDOW, SENDDONE_FAIL_OFFSET);
--- 322,328 ----
        // Immediate retransmission is the worst thing to do.
        dbg("Forwarder", "%s: send failed\n", __FUNCTION__);
!       call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_FAIL, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
! 					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
        startRetxmitTimer(SENDDONE_FAIL_WINDOW, SENDDONE_FAIL_OFFSET);
***************
*** 330,334 ****
        if (--qe->retries) { 
          dbg("Forwarder", "%s: not acked\n", __FUNCTION__);
!         call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_WAITACK, error, TOS_NODE_ID, 
                                           call AMPacket.destination(msg));
          startRetxmitTimer(SENDDONE_NOACK_WINDOW, SENDDONE_NOACK_OFFSET);
--- 332,338 ----
        if (--qe->retries) { 
          dbg("Forwarder", "%s: not acked\n", __FUNCTION__);
!         call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_WAITACK, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
! 					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
          startRetxmitTimer(SENDDONE_NOACK_WINDOW, SENDDONE_NOACK_OFFSET);
***************
*** 339,350 ****
              signal Send.sendDone[qe->client](msg, FAIL);
              call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_FAIL_ACK_SEND, 
!                                                error, TOS_NODE_ID, 
!                                                call AMPacket.destination(msg));
          } else {
              call MessagePool.put(qe->msg);
              call QEntryPool.put(qe);      
              call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_FAIL_ACK_FWD, 
!                                                error, TOS_NODE_ID, 
!                                                call AMPacket.destination(msg));
          }
          call SendQueue.dequeue();
--- 343,356 ----
              signal Send.sendDone[qe->client](msg, FAIL);
              call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_FAIL_ACK_SEND, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
! 					 call CollectionPacket.getOrigin(msg), 
!                                          call AMPacket.destination(msg));
          } else {
              call MessagePool.put(qe->msg);
              call QEntryPool.put(qe);      
              call CollectionDebug.logEventRoute(NET_C_FE_SENDDONE_FAIL_ACK_FWD, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
! 					 call CollectionPacket.getOrigin(msg), 
!                                          call AMPacket.destination(msg));
          }
          call SendQueue.dequeue();
***************
*** 358,362 ****
        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;
--- 364,370 ----
        dbg("Forwarder", "%s: our packet for client %hhu, remove %p from queue\n", 
            __FUNCTION__, client, qe);
!       call CollectionDebug.logEventRoute(NET_C_FE_SENT_MSG, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
! 					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
        clientPtrs[client] = qe;
***************
*** 370,374 ****
        // 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 SentCache.insert(call CollectionPacket.getPacketID(qe->msg));
--- 378,384 ----
        // 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, 
! 					 call CollectionPacket.getSequenceNumber(msg), 
! 					 call CollectionPacket.getOrigin(msg), 
                                           call AMPacket.destination(msg));
        call SentCache.insert(call CollectionPacket.getPacketID(qe->msg));
***************
*** 443,447 ****
      collectid = hdr->collectid;
  
!     call CollectionDebug.logEvent(NET_C_FE_RCV_MSG);
      if (len > call SubSend.maxPayloadLength()) {
        return msg;
--- 453,460 ----
      collectid = hdr->collectid;
  
!     call CollectionDebug.logEventRoute(NET_C_FE_RCV_MSG,
! 					 call CollectionPacket.getSequenceNumber(msg), 
! 					 call CollectionPacket.getOrigin(msg), 
!                                          call AMPacket.destination(msg));
      if (len > call SubSend.maxPayloadLength()) {
        return msg;