[Tinyos-2-commits] CVS: tinyos-2.x/tos/lib/net/ctp CtpForwardingEngineP.nc, 1.1.2.13, 1.1.2.14

[Rodrigo Fonseca]

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

Modified Files:
      Tag: tinyos-2_0_devel-BRANCH
	CtpForwardingEngineP.nc 
Log Message:
Fixed debugging statement misplacement


Index: CtpForwardingEngineP.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-2.x/tos/lib/net/ctp/Attic/CtpForwardingEngineP.nc,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -C2 -d -r1.1.2.13 -r1.1.2.14
*** CtpForwardingEngineP.nc	27 Oct 2006 18:05:03 -0000	1.1.2.13
--- CtpForwardingEngineP.nc	27 Oct 2006 19:36:04 -0000	1.1.2.14
***************
*** 180,184 ****
  
    /* Tracks our parent's congestion state. */
!   //bool parentCongested = FALSE;
  
    /* Keeps track of whether the routing layer is running; if not,
--- 180,184 ----
  
    /* Tracks our parent's congestion state. */
!   bool parentCongested = FALSE;
  
    /* Keeps track of whether the routing layer is running; if not,
***************
*** 417,429 ****
          // Our parent is congested. We should wait.
          // Don't repost the task, CongestionTimer will do the job
          if (! call CongestionTimer.isRunning()) {
            startCongestionTimer(CONGESTED_WAIT_WINDOW, CONGESTED_WAIT_OFFSET);
-           call CollectionDebug.logEvent(NET_C_FE_CONGESTION_BEGIN);
          } 
          dbg("Forwarder", "%s: sendTask deferring for congested parent\n",
              __FUNCTION__);
!         call CollectionDebug.logEvent(NET_C_FE_CONGESTION_SENDWAIT);
          return;
!       }
        // Once we are here, we have decided to send the packet.
        if (call SentCache.lookup(qe->msg)) {
--- 417,436 ----
          // Our parent is congested. We should wait.
          // Don't repost the task, CongestionTimer will do the job
+         if (! parentCongested ) {
+           parentCongested = TRUE;
+           call CollectionDebug.logEvent(NET_C_FE_CONGESTION_BEGIN);
+         }
          if (! call CongestionTimer.isRunning()) {
            startCongestionTimer(CONGESTED_WAIT_WINDOW, CONGESTED_WAIT_OFFSET);
          } 
          dbg("Forwarder", "%s: sendTask deferring for congested parent\n",
              __FUNCTION__);
!         //call CollectionDebug.logEvent(NET_C_FE_CONGESTION_SENDWAIT);
          return;
!       } 
!       if (parentCongested) {
!         parentCongested = FALSE;
!         call CollectionDebug.logEvent(NET_C_FE_CONGESTION_END);
!       } 
        // Once we are here, we have decided to send the packet.
        if (call SentCache.lookup(qe->msg)) {
***************
*** 821,825 ****
    event void CongestionTimer.fired() {
      //parentCongested = FALSE;
!     call CollectionDebug.logEventSimple(NET_C_FE_CONGESTION_END, 0);
      post sendTask();
    }
--- 828,832 ----
    event void CongestionTimer.fired() {
      //parentCongested = FALSE;
!     //call CollectionDebug.logEventSimple(NET_C_FE_CONGESTION_END, 0);
      post sendTask();
    }