[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Drain Drain.h, 1.12, 1.13 DrainGroup.nc, 1.2, 1.3 DrainGroupManagerM.nc, 1.2, 1.3

[Gilman Tolle]

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

Modified Files:
	Drain.h DrainGroup.nc DrainGroupManagerM.nc 
Log Message:
Added timeouts to DrainGroupManager

Index: Drain.h
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/Drain.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Drain.h	15 Jul 2005 22:40:12 -0000	1.12
--- Drain.h	16 Jul 2005 01:30:25 -0000	1.13
***************
*** 90,94 ****
  typedef struct DrainGroupRegisterMsg {
    uint16_t group;
!   uint8_t timeout;
  } DrainGroupRegisterMsg;
  
--- 90,94 ----
  typedef struct DrainGroupRegisterMsg {
    uint16_t group;
!   uint16_t timeout;
  } DrainGroupRegisterMsg;
  

Index: DrainGroup.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainGroup.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DrainGroup.nc	14 Jun 2005 18:16:22 -0000	1.2
--- DrainGroup.nc	16 Jul 2005 01:30:26 -0000	1.3
***************
*** 2,5 ****
  
  interface DrainGroup {
!   command result_t joinGroup(uint16_t group);
  }
--- 2,5 ----
  
  interface DrainGroup {
!   command result_t joinGroup(uint16_t group, uint16_t timeout);
  }

Index: DrainGroupManagerM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Drain/DrainGroupManagerM.nc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** DrainGroupManagerM.nc	14 Jun 2005 18:16:22 -0000	1.2
--- DrainGroupManagerM.nc	16 Jul 2005 01:30:26 -0000	1.3
***************
*** 13,17 ****
    bool msgBufBusy;
  
!   command result_t DrainGroup.joinGroup(uint16_t group) {
      uint16_t length;
  
--- 13,17 ----
    bool msgBufBusy;
  
!   command result_t DrainGroup.joinGroup(uint16_t group, uint16_t timeout) {
      uint16_t length;
  
***************
*** 23,27 ****
  
      regMsg->group = group;
!     regMsg->timeout = 4; // XXX: pick something good
  
      if (call SendMsg.send(TOS_DEFAULT_ADDR,
--- 23,27 ----
  
      regMsg->group = group;
!     regMsg->timeout = timeout; // XXX: pick something good
  
      if (call SendMsg.send(TOS_DEFAULT_ADDR,
***************
*** 33,37 ****
      } else {
        dbg(DBG_ROUTE, "DrainGroupManagerM: joining group %d\n", group);
!       call GroupManager.joinGroup(group);
      }	
  
--- 33,37 ----
      } else {
        dbg(DBG_ROUTE, "DrainGroupManagerM: joining group %d\n", group);
!       call GroupManager.joinGroup(group, timeout);
      }	
  
***************
*** 44,48 ****
      DrainGroupRegisterMsg *regMsg = (DrainGroupRegisterMsg*) payload;
  
!     call GroupManager.joinForward(regMsg->group);
  
      dbg(DBG_ROUTE, "DrainGroupManagerM: becoming forwarder for group %d\n", 
--- 44,48 ----
      DrainGroupRegisterMsg *regMsg = (DrainGroupRegisterMsg*) payload;
  
!     call GroupManager.joinForward(regMsg->group, regMsg->timeout);
  
      dbg(DBG_ROUTE, "DrainGroupManagerM: becoming forwarder for group %d\n",