[Tinyos-beta-commits] CVS: tinyos-1.x/beta/Deluge/Deluge DelugeMetadata.nc, 1.6, 1.7 DelugeMetadataM.nc, 1.14, 1.15 DelugePageTransferM.nc, 1.9, 1.10 DelugeStats.nc, 1.1, 1.2

[Jonathan Hui]

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

Modified Files:
	DelugeMetadata.nc DelugeMetadataM.nc DelugePageTransferM.nc 
	DelugeStats.nc 
Log Message:
- Moved getVNum to DelugeStats to expose it to other
components. Useful for checking if the entire network has received a
specific image.



Index: DelugeMetadata.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeMetadata.nc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** DelugeMetadata.nc	20 Apr 2005 23:26:59 -0000	1.6
--- DelugeMetadata.nc	26 Apr 2005 23:40:10 -0000	1.7
***************
*** 36,40 ****
    command result_t getImgDesc(imgnum_t imgNum, DelugeImgDesc* imgDesc);
    command dm_cmp_t compareImgDesc(DelugeImgDesc* imgDesc);
-   command imgvnum_t getVNum(imgnum_t imgNum);
  
    command result_t setupNewImage(DelugeImgDesc* imgDesc);
--- 36,39 ----

Index: DelugeMetadataM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeMetadataM.nc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** DelugeMetadataM.nc	20 Apr 2005 23:26:59 -0000	1.14
--- DelugeMetadataM.nc	26 Apr 2005 23:40:10 -0000	1.15
***************
*** 234,238 ****
    }
  
!   command imgvnum_t Metadata.getVNum[uint8_t id](imgnum_t imgNum) {
      return imgDesc[imgNum].vNum;
    }
--- 234,238 ----
    }
  
!   command imgvnum_t DelugeStats.getVNum(imgnum_t imgNum) {
      return imgDesc[imgNum].vNum;
    }

Index: DelugePageTransferM.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugePageTransferM.nc,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** DelugePageTransferM.nc	20 Apr 2005 23:26:59 -0000	1.9
--- DelugePageTransferM.nc	26 Apr 2005 23:40:10 -0000	1.10
***************
*** 189,193 ****
        pReqMsg->imgNum = workingImgNum;
        pReqMsg->pgNum = workingPgNum;
!       pReqMsg->vNum = call Metadata.getVNum(workingImgNum);
        memcpy(pReqMsg->requestedPkts, pktsToReceive, DELUGE_PKT_BITVEC_SIZE);
      }
--- 189,193 ----
        pReqMsg->imgNum = workingImgNum;
        pReqMsg->pgNum = workingPgNum;
!       pReqMsg->vNum = call DelugeStats.getVNum(workingImgNum);
        memcpy(pReqMsg->requestedPkts, pktsToReceive, DELUGE_PKT_BITVEC_SIZE);
      }
***************
*** 252,256 ****
  
      if (dataQLen < DELUGE_DATA_Q_SIZE
! 	&& rxDataMsg->vNum == call Metadata.getVNum(workingImgNum)
  	&& rxDataMsg->imgNum == workingImgNum
  	&& rxDataMsg->pgNum == workingPgNum
--- 252,256 ----
  
      if (dataQLen < DELUGE_DATA_Q_SIZE
! 	&& rxDataMsg->vNum == call DelugeStats.getVNum(workingImgNum)
  	&& rxDataMsg->imgNum == workingImgNum
  	&& rxDataMsg->pgNum == workingPgNum
***************
*** 296,300 ****
  	return;
        changeState(S_SENDING);
!       pDataMsg->vNum = call Metadata.getVNum(vars.tx.imgToSend);
        pDataMsg->imgNum = vars.tx.imgToSend;
        pDataMsg->pgNum = vars.tx.pageToSend;
--- 296,300 ----
  	return;
        changeState(S_SENDING);
!       pDataMsg->vNum = call DelugeStats.getVNum(vars.tx.imgToSend);
        pDataMsg->imgNum = vars.tx.imgToSend;
        pDataMsg->pgNum = vars.tx.pageToSend;
***************
*** 338,343 ****
        if (rxReqMsg->imgNum < vars.tx.imgToSend
  	  || (rxReqMsg->imgNum == vars.tx.imgToSend
! 	      && (rxReqMsg->vNum - call Metadata.getVNum(vars.tx.imgToSend) > 0
! 		  || (rxReqMsg->vNum == call Metadata.getVNum(vars.tx.imgToSend)
  		      && rxReqMsg->pgNum < vars.tx.pageToSend)))) {
  	changeState(S_IDLE);
--- 338,343 ----
        if (rxReqMsg->imgNum < vars.tx.imgToSend
  	  || (rxReqMsg->imgNum == vars.tx.imgToSend
! 	      && (rxReqMsg->vNum - call DelugeStats.getVNum(vars.tx.imgToSend) > 0
! 		  || (rxReqMsg->vNum == call DelugeStats.getVNum(vars.tx.imgToSend)
  		      && rxReqMsg->pgNum < vars.tx.pageToSend)))) {
  	changeState(S_IDLE);
***************
*** 357,361 ****
  
      if (rxReqMsg->pgNum >= call DelugeStats.getNumPgsComplete(rxReqMsg->imgNum)
! 	|| rxReqMsg->vNum != call Metadata.getVNum(rxReqMsg->imgNum)) {
        // don't have this page, ignore request
        return pMsg;
--- 357,361 ----
  
      if (rxReqMsg->pgNum >= call DelugeStats.getNumPgsComplete(rxReqMsg->imgNum)
! 	|| rxReqMsg->vNum != call DelugeStats.getVNum(rxReqMsg->imgNum)) {
        // don't have this page, ignore request
        return pMsg;
***************
*** 365,369 ****
  	|| ((state == S_SENDING || state == S_TX_LOCKING)
  	    && rxReqMsg->imgNum == vars.tx.imgToSend
! 	    && rxReqMsg->vNum == call Metadata.getVNum(vars.tx.imgToSend)
  	    && rxReqMsg->pgNum == vars.tx.pageToSend)) {
        // take union of packet bit vectors
--- 365,369 ----
  	|| ((state == S_SENDING || state == S_TX_LOCKING)
  	    && rxReqMsg->imgNum == vars.tx.imgToSend
! 	    && rxReqMsg->vNum == call DelugeStats.getVNum(vars.tx.imgToSend)
  	    && rxReqMsg->pgNum == vars.tx.pageToSend)) {
        // take union of packet bit vectors

Index: DelugeStats.nc
===================================================================
RCS file: /cvsroot/tinyos/tinyos-1.x/beta/Deluge/Deluge/DelugeStats.nc,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DelugeStats.nc	20 Apr 2005 23:26:59 -0000	1.1
--- DelugeStats.nc	26 Apr 2005 23:40:10 -0000	1.2
***************
*** 4,7 ****
--- 4,8 ----
    command pgnum_t getNumPgs(imgnum_t imgNum);
    command pgnum_t getNumPgsComplete(imgnum_t imgNum);
+   command imgvnum_t getVNum(imgnum_t imgNum);
  
  }