[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drip Drip.h, 1.2, 1.3 DripM.nc, 1.4, 1.5 DripStateM.nc, 1.3, 1.4

[Gilman Tolle]

Update of /cvsroot/tinyos/tinyos-1.x/beta/Drip
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv554

Modified Files:
	Drip.h DripM.nc DripStateM.nc 
Log Message:
Increased the Drip timer rate from 1s to 100ms, to support higher traffic rates in the NEST final experiment. This should eventually be configurable on a per-channel basis.

Index: Drip.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drip/Drip.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Drip.h	27 Apr 2005 02:48:26 -0000	1.2
--- Drip.h	10 Jun 2005 19:12:58 -0000	1.3
***************
*** 63,67 ****
    DRIP_SEQNO_NEWEST = 0,
    DRIP_SEQNO_FIRST = 2,
!   DRIP_TIMER_PERIOD = 1024,
    DRIP_MIN_SEND_INTERVAL = 0,
    DRIP_MAX_SEND_INTERVAL = 15,
--- 63,67 ----
    DRIP_SEQNO_NEWEST = 0,
    DRIP_SEQNO_FIRST = 2,
!   DRIP_TIMER_PERIOD = 100,
    DRIP_MIN_SEND_INTERVAL = 0,
    DRIP_MAX_SEND_INTERVAL = 15,

Index: DripM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drip/DripM.nc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** DripM.nc	4 May 2005 23:23:13 -0000	1.4
--- DripM.nc	10 Jun 2005 19:12:58 -0000	1.5
***************
*** 99,105 ****
  	msgBufBusy = TRUE;
        
- 	dbg(DBG_USR1, "Sending id: %d\n", readyKey);
  	if (!signal Drip.rebroadcastRequest[readyKey](pMsgBuf, dripMsg->data)) {
  	  msgBufBusy = FALSE;
  	}
        }
--- 99,106 ----
  	msgBufBusy = TRUE;
        
  	if (!signal Drip.rebroadcastRequest[readyKey](pMsgBuf, dripMsg->data)) {
  	  msgBufBusy = FALSE;
+ 	} else {
+ 	  dbg(DBG_USR1, "Sending id: %d\n", readyKey);
  	}
        }
***************
*** 176,181 ****
      DripMsg *dripMsg = (DripMsg*) pMsg->data;
  
!     dbg(DBG_USR1, "Received msg(id=%d, seqno=%d)\n",
! 	dripMsg->metadata.id, dripMsg->metadata.seqno);
  
      if (call DripState.newMsg[dripMsg->metadata.id](dripMsg->metadata)) {
--- 177,182 ----
      DripMsg *dripMsg = (DripMsg*) pMsg->data;
  
! //    dbg(DBG_USR1, "Received msg(id=%d, seqno=%d)\n",
! //	dripMsg->metadata.id, dripMsg->metadata.seqno);
  
      if (call DripState.newMsg[dripMsg->metadata.id](dripMsg->metadata)) {

Index: DripStateM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drip/DripStateM.nc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** DripStateM.nc	4 May 2005 23:23:13 -0000	1.3
--- DripStateM.nc	10 Jun 2005 19:12:58 -0000	1.4
***************
*** 229,234 ****
        if (dripCache[i].trickleCountdown <= dripCache[i].trickleAnnounce &&
  	  dripCache[i].trickleState == DRIP_PRE_SEND) {      
! 	dbg(DBG_USR1, "READY: ");
! 	printCacheEntry(&dripCache[i]);
  	return dripCache[i].metadata.id;
        }
--- 229,234 ----
        if (dripCache[i].trickleCountdown <= dripCache[i].trickleAnnounce &&
  	  dripCache[i].trickleState == DRIP_PRE_SEND) {      
! //	dbg(DBG_USR1, "READY: ");
! //	printCacheEntry(&dripCache[i]);
  	return dripCache[i].metadata.id;
        }