[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/delugetools Pinger.java, 1.13, 1.14

[Jonathan Hui]

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

Modified Files:
	Pinger.java 
Log Message:
- Removed a minor bug that wasted a transmission that queried an image
that doesn't exist.



Index: Pinger.java
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/delugetools/Pinger.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** Pinger.java	14 Jul 2005 17:36:46 -0000	1.13
--- Pinger.java	17 Jul 2005 21:13:18 -0000	1.14
***************
*** 88,93 ****
      advMsg.set_version(DelugeConsts.DELUGE_VERSION);
      advMsg.set_type((short)DelugeConsts.DELUGE_ADV_PING);
!     advMsg.set_nodeDesc_vNum(DelugeConsts.DELUGE_INVALID_VNUM);
!     advMsg.set_nodeDesc_imgNum(DelugeConsts.DELUGE_INVALID_IMGNUM);
      advMsg.set_imgDesc_vNum(DelugeConsts.DELUGE_INVALID_VNUM);
  
--- 88,92 ----
      advMsg.set_version(DelugeConsts.DELUGE_VERSION);
      advMsg.set_type((short)DelugeConsts.DELUGE_ADV_PING);
!     advMsg.set_nodeDesc_vNum((short)DelugeConsts.DELUGE_INVALID_VNUM);
      advMsg.set_imgDesc_vNum(DelugeConsts.DELUGE_INVALID_VNUM);
  
***************
*** 97,102 ****
      for (;;) {
        try {
- 	Thread.currentThread().sleep(500);
- 
  	if (receivedExecutingIdent)
  	  break;
--- 96,99 ----
***************
*** 112,115 ****
--- 109,114 ----
  	    pcAddr = (short)MoteIF.TOS_BCAST_ADDR;
  	}
+ 
+ 	Thread.currentThread().sleep(500);
        } catch (Exception e) {
  	e.printStackTrace();
***************
*** 122,137 ****
      for (;;) {
        try {
- 	Thread.currentThread().sleep(500);
- 
  	attempts++;
  	if (attempts > MAX_ATTEMPTS)
  	  dest = MoteIF.TOS_BCAST_ADDR;
  
! 	if ((advMsg.get_imgDesc_imgNum() >= numImages
! 	     && numImages != -1)
  	    || error )
  	  break;
  
  	advMsg.set_sourceAddr(pcAddr);
  	advMsg = DelugeCrc.computeAdvCrc(advMsg);
  	requesting = false;
--- 121,134 ----
      for (;;) {
        try {
  	attempts++;
  	if (attempts > MAX_ATTEMPTS)
  	  dest = MoteIF.TOS_BCAST_ADDR;
  
! 	if ( ( curImage >= numImages && numImages != -1)
  	    || error )
  	  break;
  
  	advMsg.set_sourceAddr(pcAddr);
+ 	advMsg.set_imgDesc_imgNum(curImage);
  	advMsg = DelugeCrc.computeAdvCrc(advMsg);
  	requesting = false;
***************
*** 148,151 ****
--- 145,150 ----
  	    pcAddr = (short)MoteIF.TOS_BCAST_ADDR;
  	}
+ 
+ 	Thread.currentThread().sleep(500);
        } catch (Exception e) {
  	e.printStackTrace();
***************
*** 192,200 ****
      pktsReceived = 0;
      curImage++;
-     advMsg.set_sourceAddr(pcAddr);
-     advMsg.set_imgDesc_imgNum(curImage);
-     advMsg = DelugeCrc.computeAdvCrc(advMsg);
      skipNextAdv = true;
!     send(advMsg);
      if (verbose) System.out.print(advMsg);
    }
--- 191,201 ----
      pktsReceived = 0;
      curImage++;
      skipNextAdv = true;
!     if ( curImage < numImages || numImages == -1 ) {
!       advMsg.set_sourceAddr(pcAddr);
!       advMsg.set_imgDesc_imgNum(curImage);
!       advMsg = DelugeCrc.computeAdvCrc(advMsg);
!       send(advMsg);
!     }
      if (verbose) System.out.print(advMsg);
    }