Add more checkpoint tracing

[yaffs2.git] / yaffs_checkptrw.c

diff --git a/yaffs_checkptrw.c b/yaffs_checkptrw.c
index 686a47b4393102bd82f343c90b8478213a9d8c20..2b14006b71517fe2c5dc144fabb7af6e112aab5a 100644 (file)
--- a/yaffs_checkptrw.c
+++ b/yaffs_checkptrw.c
@@ -13,7 +13,7 @@
  */
 
 const char *yaffs_checkptrw_c_version =
-    "$Id: yaffs_checkptrw.c,v 1.2 2006-05-17 09:31:07 charles Exp $";
+    "$Id: yaffs_checkptrw.c,v 1.9 2006-11-09 23:57:07 charles Exp $";
 
 
 #include "yaffs_checkptrw.h"
@@ -24,16 +24,12 @@ static int yaffs_CheckpointSpaceOk(yaffs_Device *dev)
 
        int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
        
-       if(blocksAvailable < 0)
-               blocksAvailable = 0;
-               
-       T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpt blocks available" TENDSTR)));
+       T(YAFFS_TRACE_CHECKPOINT,
+               (TSTR("checkpt blocks available = %d" TENDSTR),
+               blocksAvailable));
                
        
-       if(blocksAvailable <= 0)
-               return 0;
-               
-       return 1;
+       return (blocksAvailable <= 0) ? 0 : 1;
 }
 
 
@@ -47,10 +43,10 @@ static int yaffs_CheckpointErase(yaffs_Device *dev)
        if(!dev->eraseBlockInNAND)      
                return 0;
        T(YAFFS_TRACE_CHECKPOINT,(TSTR("checking blocks %d to %d"TENDSTR),
-               dev->startBlock,dev->endBlock));
+               dev->internalStartBlock,dev->internalEndBlock));
                
-       for(i = dev->startBlock; i <= dev->endBlock; i++) {
-               yaffs_BlockInfo *bi = &dev->blockInfo[i];
+       for(i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
+               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
                if(bi->blockState == YAFFS_BLOCK_STATE_CHECKPOINT){
                        T(YAFFS_TRACE_CHECKPOINT,(TSTR("erasing checkpt block %d"TENDSTR),i));
                        if(dev->eraseBlockInNAND(dev,i)){
@@ -75,16 +71,18 @@ static void yaffs_CheckpointFindNextErasedBlock(yaffs_Device *dev)
 {
        int  i;
        int blocksAvailable = dev->nErasedBlocks - dev->nReservedBlocks;
+       T(YAFFS_TRACE_CHECKPOINT,
+               (TSTR("allocating checkpt block: erased %d reserved %d avail %d next %d "TENDSTR),
+               dev->nErasedBlocks,dev->nReservedBlocks,blocksAvailable,dev->checkpointNextBlock));
                
        if(dev->checkpointNextBlock >= 0 &&
-          dev->checkpointNextBlock <= dev->endBlock &&
+          dev->checkpointNextBlock <= dev->internalEndBlock &&
           blocksAvailable > 0){
        
-               for(i = dev->checkpointNextBlock; i <= dev->endBlock; i++){
-                       yaffs_BlockInfo *bi = &dev->blockInfo[i];
+               for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
+                       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,i);
                        if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY){
                                dev->checkpointNextBlock = i + 1;
-                               dev->nErasedBlocks--;
                                dev->checkpointCurrentBlock = i;
                                T(YAFFS_TRACE_CHECKPOINT,(TSTR("allocating checkpt block %d"TENDSTR),i));
                                return;
@@ -103,7 +101,7 @@ static void yaffs_CheckpointFindNextCheckpointBlock(yaffs_Device *dev)
        yaffs_ExtendedTags tags;
        
        if(dev->blocksInCheckpoint < dev->checkpointMaxBlocks) 
-               for(i = dev->checkpointNextBlock; i <= dev->endBlock; i++){
+               for(i = dev->checkpointNextBlock; i <= dev->internalEndBlock; i++){
                        int chunk = i * dev->nChunksPerBlock;
 
                        dev->readChunkWithTagsFromNAND(dev,chunk,NULL,&tags);
@@ -140,7 +138,7 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
                return 0;
                        
        if(!dev->checkpointBuffer)
-               dev->checkpointBuffer = YMALLOC(dev->nBytesPerChunk);
+               dev->checkpointBuffer = YMALLOC_DMA(dev->nDataBytesPerChunk);
        if(!dev->checkpointBuffer)
                return 0;
 
@@ -152,11 +150,11 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
        dev->checkpointByteCount = 0;
        dev->checkpointCurrentBlock = -1;
        dev->checkpointCurrentChunk = -1;
-       dev->checkpointNextBlock = dev->startBlock;
+       dev->checkpointNextBlock = dev->internalStartBlock;
        
        /* Erase all the blocks in the checkpoint area */
        if(forWriting){
-               memset(dev->checkpointBuffer,0,dev->nBytesPerChunk);
+               memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
                dev->checkpointByteOffset = 0;
                return yaffs_CheckpointErase(dev);
                
@@ -164,10 +162,11 @@ int yaffs_CheckpointOpen(yaffs_Device *dev, int forWriting)
        } else {
                int i;
                /* Set to a value that will kick off a read */
-               dev->checkpointByteOffset = dev->nBytesPerChunk;
+               dev->checkpointByteOffset = dev->nDataBytesPerChunk;
                /* A checkpoint block list of 1 checkpoint block per 16 block is (hopefully)
                 * going to be way more than we need */
-               dev->checkpointMaxBlocks = (dev->endBlock - dev->startBlock)/16 + 2;
+               dev->blocksInCheckpoint = 0;
+               dev->checkpointMaxBlocks = (dev->internalEndBlock - dev->internalStartBlock)/16 + 2;
                dev->checkpointBlockList = YMALLOC(sizeof(int) * dev->checkpointMaxBlocks);
                for(i = 0; i < dev->checkpointMaxBlocks; i++)
                        dev->checkpointBlockList[i] = -1;
@@ -195,10 +194,20 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
        tags.objectId = dev->checkpointNextBlock; /* Hint to next place to look */
        tags.chunkId = dev->checkpointPageSequence + 1;
        tags.sequenceNumber =  YAFFS_SEQUENCE_CHECKPOINT_DATA;
-       tags.byteCount = dev->nBytesPerChunk;
+       tags.byteCount = dev->nDataBytesPerChunk;
+       if(dev->checkpointCurrentChunk == 0){
+               /* First chunk we write for the block? Set block state to
+                  checkpoint */
+               yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointCurrentBlock);
+               bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
+               dev->blocksInCheckpoint++;
+       }
        
        chunk = dev->checkpointCurrentBlock * dev->nChunksPerBlock + dev->checkpointCurrentChunk;
-               
+       
+       T(YAFFS_TRACE_CHECKPOINT,(TSTR("checkpoint wite buffer nand %d(%d:%d) objid %d chId %d" TENDSTR),
+               chunk, dev->checkpointCurrentBlock, dev->checkpointCurrentChunk,tags.objectId,tags.chunkId)); 
+
        dev->writeChunkWithTagsToNAND(dev,chunk,dev->checkpointBuffer,&tags);
        dev->checkpointByteOffset = 0;
        dev->checkpointPageSequence++;     
@@ -207,7 +216,7 @@ static int yaffs_CheckpointFlushBuffer(yaffs_Device *dev)
                dev->checkpointCurrentChunk = 0;
                dev->checkpointCurrentBlock = -1;
        }
-       memset(dev->checkpointBuffer,0,dev->nBytesPerChunk);
+       memset(dev->checkpointBuffer,0,dev->nDataBytesPerChunk);
        
        return 1;
 }
@@ -238,7 +247,7 @@ int yaffs_CheckpointWrite(yaffs_Device *dev,const void *data, int nBytes)
                
                
                if(dev->checkpointByteOffset < 0 ||
-                  dev->checkpointByteOffset >= dev->nBytesPerChunk) 
+                  dev->checkpointByteOffset >= dev->nDataBytesPerChunk) 
                        ok = yaffs_CheckpointFlushBuffer(dev);
 
        }
@@ -264,7 +273,7 @@ int yaffs_CheckpointRead(yaffs_Device *dev, void *data, int nBytes)
        
        
                if(dev->checkpointByteOffset < 0 ||
-                  dev->checkpointByteOffset >= dev->nBytesPerChunk) {
+                  dev->checkpointByteOffset >= dev->nDataBytesPerChunk) {
                   
                        if(dev->checkpointCurrentBlock < 0){
                                yaffs_CheckpointFindNextCheckpointBlock(dev);
@@ -318,7 +327,7 @@ int yaffs_CheckpointClose(yaffs_Device *dev)
        } else {
                int i;
                for(i = 0; i < dev->blocksInCheckpoint && dev->checkpointBlockList[i] >= 0; i++){
-                       yaffs_BlockInfo *bi = &dev->blockInfo[dev->checkpointBlockList[i]];
+                       yaffs_BlockInfo *bi = yaffs_GetBlockInfo(dev,dev->checkpointBlockList[i]);
                        if(bi->blockState == YAFFS_BLOCK_STATE_EMPTY)
                                bi->blockState = YAFFS_BLOCK_STATE_CHECKPOINT;
                        else {