[Tinyos-beta-commits] CVS: tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector TestMMDetector.nc, 1.1, 1.2 TestMMDetectorM.nc, 1.1, 1.2

[Stan Rost]

Update of /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10769/TestMMDetector

Modified Files:
	TestMMDetector.nc TestMMDetectorM.nc 
Log Message:
- Incorporated the new failure detection scheme 
  (sans the history/tree rebuilding)
- Incorporated aggressive transmission
- Fixed a ton of bugs


Index: TestMMDetector.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector/TestMMDetector.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMMDetector.nc	27 Aug 2004 22:48:50 -0000	1.1
--- TestMMDetector.nc	20 Sep 2004 16:44:37 -0000	1.2
***************
*** 3,7 ****
  }
  implementation {
!   components Main, WatcherCoreC, 
      TimeSyncC, TestMMDetectorM,
      TimerC, RollCallC, WMEWMAMultiHopRouter as Router;
--- 3,7 ----
  }
  implementation {
!   components Main,
      TimeSyncC, TestMMDetectorM,
      TimerC, RollCallC, WMEWMAMultiHopRouter as Router;
***************
*** 9,23 ****
    Main.StdControl -> TestMMDetectorM.StdControl;
    Main.StdControl -> TimeSyncC.StdControl;
-   Main.StdControl -> WatcherCoreC.StdControl;
    Main.StdControl -> TimerC.StdControl;
    Main.StdControl -> RollCallC;
  
-   TestMMDetectorM.WatcherState -> WatcherCoreC.WatcherState;
    TestMMDetectorM.RouteControl -> Router;
  
    RollCallC.RouteControl -> Router;
  
    TimeSyncC.TimeSyncAuthority -> TestMMDetectorM.TimeSyncAuthority;
  
    TestMMDetectorM.Timer -> TimerC.Timer[unique("Timer")];
  }
--- 9,27 ----
    Main.StdControl -> TestMMDetectorM.StdControl;
    Main.StdControl -> TimeSyncC.StdControl;
    Main.StdControl -> TimerC.StdControl;
+   Main.StdControl -> Router;
    Main.StdControl -> RollCallC;
  
    TestMMDetectorM.RouteControl -> Router;
  
+   TimeSyncC.TimeSyncPiggy -> TestMMDetectorM.PiggyBack;
+   TestMMDetectorM.SourceAddress -> TimeSyncC.SourceAddress;
+ 
    RollCallC.RouteControl -> Router;
+   RollCallC.HeartBeatHandler -> TestMMDetectorM.HeartBeatHandler;
  
    TimeSyncC.TimeSyncAuthority -> TestMMDetectorM.TimeSyncAuthority;
  
    TestMMDetectorM.Timer -> TimerC.Timer[unique("Timer")];
+ 
  }

Index: TestMMDetectorM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/SystemCore/MementoMori/TestMMDetector/TestMMDetectorM.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestMMDetectorM.nc	27 Aug 2004 22:48:51 -0000	1.1
--- TestMMDetectorM.nc	20 Sep 2004 16:44:37 -0000	1.2
***************
*** 4,14 ****
  
      interface TimeSyncAuthority;
    }
  
    uses {
      interface Timer;
-     interface WatcherState;
  
      interface RouteControl;
    }
  }
--- 4,19 ----
  
      interface TimeSyncAuthority;
+ 
+     // Bridge the two
+     interface PiggyBack;
+     interface HeartBeatHandler;
    }
  
    uses {
      interface Timer;
  
      interface RouteControl;
+ 
+     interface SourceAddress;
    }
  }
***************
*** 48,52 ****
  
    command bool TimeSyncAuthority.isAuthoritative(uint16_t addr) {
!     return (addr == call RouteControl.getParent());
    }
  
--- 53,94 ----
  
    command bool TimeSyncAuthority.isAuthoritative(uint16_t addr) {
! 
!     dbg(DBG_USR1, "AUTH = (parent node %u, depth %u)\n",
! 	call RouteControl.getParent(),
! 	call RouteControl.getDepth());
!  
!     return (call RouteControl.getDepth() == 0 ||
! 	    addr == call RouteControl.getParent());
!   }
! 
!   command uint32_t HeartBeatHandler.getPeriod() {
!     return 2048;
!   }
!   
!   command bool PiggyBack.piggySuppress(TOS_MsgPtr msg,
! 				       uint8_t *buf,
! 				       uint8_t lenRemaining) {
!     
!     return FALSE;
!   }
! 
!   command result_t PiggyBack.piggySend(TOS_MsgPtr msg,
! 				       uint8_t *buf,
! 				       uint8_t *len,
! 				       uint8_t lenRemaining) {
! 
!     dbg(DBG_USR1, "* Sending hb as alive\n\n");
! 
!     return SUCCESS;
!   }
! 
!   command result_t PiggyBack.piggyReceive(TOS_MsgPtr msg,
! 					  uint8_t *buf,
! 					  uint8_t lenRemaining) {
! 
!     signal HeartBeatHandler.receiveHeartBeat(call SourceAddress.getAddress(msg),
! 					     NULL);
! 
!     return SUCCESS;
    }