Add more tracing to yafs_VerifyDirectory

[yaffs2.git] / yaffs_guts.c

diff --git a/yaffs_guts.c b/yaffs_guts.c
index c74e25ed68bf4e9846aaecc181c5f5a937032726..72532c2b6a9627f1231c7bfc33f0423c8f3453e3 100644 (file)
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -12,7 +12,7 @@
  */
 
 const char *yaffs_guts_c_version =
-    "$Id: yaffs_guts.c,v 1.65 2008-11-26 20:42:04 charles Exp $";
+    "$Id: yaffs_guts.c,v 1.68 2008-11-27 20:32:52 charles Exp $";
 
 #include "yportenv.h"
 
@@ -406,14 +406,11 @@ static int yaffs_SkipVerification(yaffs_Device *dev)
        return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY | YAFFS_TRACE_VERIFY_FULL));
 }
 
-#if 0
 static int yaffs_SkipFullVerification(yaffs_Device *dev)
 {
        return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_FULL));
 }
 
-#endif
-
 static int yaffs_SkipNANDVerification(yaffs_Device *dev)
 {
        return !(yaffs_traceMask & (YAFFS_TRACE_VERIFY_NAND));
@@ -2993,17 +2990,17 @@ static int yaffs_GetErasedChunks(yaffs_Device * dev)
 
 }
 
-static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
+static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block, int wholeBlock)
 {
        int oldChunk;
        int newChunk;
-       int chunkInBlock;
        int markNAND;
        int retVal = YAFFS_OK;
        int cleanups = 0;
        int i;
        int isCheckpointBlock;
        int matchingChunk;
+       int maxCopies;
 
        int chunksBefore = yaffs_GetErasedChunks(dev);
        int chunksAfter;
@@ -3019,8 +3016,11 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
        bi->blockState = YAFFS_BLOCK_STATE_COLLECTING;
 
        T(YAFFS_TRACE_TRACING,
-         (TSTR("Collecting block %d, in use %d, shrink %d, " TENDSTR), block,
-          bi->pagesInUse, bi->hasShrinkHeader));
+         (TSTR("Collecting block %d, in use %d, shrink %d, wholeBlock %d" TENDSTR), 
+         block,
+         bi->pagesInUse,
+         bi->hasShrinkHeader,
+         wholeBlock));
 
        /*yaffs_VerifyFreeChunks(dev); */
 
@@ -3046,14 +3046,20 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                
                yaffs_VerifyBlock(dev,bi,block);
 
-               for (chunkInBlock = 0, oldChunk = block * dev->nChunksPerBlock;
+               maxCopies = (wholeBlock) ? dev->nChunksPerBlock : 10;
+               oldChunk = block * dev->nChunksPerBlock + dev->gcChunk;
+               
+               for ( /* init already done */;
                     retVal == YAFFS_OK &&
-                    chunkInBlock < dev->nChunksPerBlock
-                    && yaffs_StillSomeChunkBits(dev, block);
-                    chunkInBlock++, oldChunk++) {
-                       if (yaffs_CheckChunkBit(dev, block, chunkInBlock)) {
+                    dev->gcChunk < dev->nChunksPerBlock &&
+                    (bi->blockState == YAFFS_BLOCK_STATE_COLLECTING)&&
+                    maxCopies > 0;
+                    dev->gcChunk++, oldChunk++) {
+                       if (yaffs_CheckChunkBit(dev, block, dev->gcChunk)) {
 
                                /* This page is in use and might need to be copied off */
+                               
+                               maxCopies--;
 
                                markNAND = 1;
 
@@ -3068,8 +3074,8 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
 
                                T(YAFFS_TRACE_GC_DETAIL,
                                  (TSTR
-                                  ("Collecting page %d, %d %d %d " TENDSTR),
-                                  chunkInBlock, tags.objectId, tags.chunkId,
+                                  ("Collecting chunk in block %d, %d %d %d " TENDSTR),
+                                  dev->gcChunk, tags.objectId, tags.chunkId,
                                   tags.byteCount));
                                   
                                if(object && !yaffs_SkipVerification(dev)){
@@ -3148,7 +3154,6 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                                                yaffs_ObjectHeader *oh;
                                                oh = (yaffs_ObjectHeader *)buffer;
                                                oh->isShrink = 0;
-/*                                             oh->shadowsObject = oh->inbandShadowsObject = -1; */
                                                tags.extraShadows = 0;
                                                tags.extraIsShrinkHeader = 0;
                                                
@@ -3185,6 +3190,7 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                }
 
                yaffs_ReleaseTempBuffer(dev, buffer, __LINE__);
+               
 
 
                /* Do any required cleanups */
@@ -3219,6 +3225,12 @@ static int yaffs_GarbageCollectBlock(yaffs_Device * dev, int block)
                    TENDSTR), chunksBefore, chunksAfter));
        }
 
+       /* If the gc completed then clear the current gcBlock so that we find another. */
+       if(bi->blockState != YAFFS_BLOCK_STATE_COLLECTING){
+               dev->gcBlock = -1;
+               dev->gcChunk = 0;
+       }
+       
        dev->isDoingGC = 0;
 
        return retVal;
@@ -3266,7 +3278,12 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
                        aggressive = 0;
                }
 
-               block = yaffs_FindBlockForGarbageCollection(dev, aggressive);
+               if(dev->gcBlock <= 0){
+                       dev->gcBlock = yaffs_FindBlockForGarbageCollection(dev, aggressive);
+                       dev->gcChunk = 0;
+               }
+               
+               block = dev->gcBlock;
 
                if (block > 0) {
                        dev->garbageCollections++;
@@ -3279,7 +3296,7 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
                           ("yaffs: GC erasedBlocks %d aggressive %d" TENDSTR),
                           dev->nErasedBlocks, aggressive));
 
-                       gcOk = yaffs_GarbageCollectBlock(dev, block);
+                       gcOk = yaffs_GarbageCollectBlock(dev,block,aggressive);
                }
 
                if (dev->nErasedBlocks < (dev->nReservedBlocks) && block > 0) {
@@ -3288,8 +3305,9 @@ static int yaffs_CheckGarbageCollection(yaffs_Device * dev)
                           ("yaffs: GC !!!no reclaim!!! erasedBlocks %d after try %d block %d"
                            TENDSTR), dev->nErasedBlocks, maxTries, block));
                }
-       } while ((dev->nErasedBlocks < dev->nReservedBlocks) && (block > 0)
-                && (maxTries < 2));
+       } while ((dev->nErasedBlocks < dev->nReservedBlocks) && 
+                (block > 0) &&
+                (maxTries < 2));
 
        return aggressive ? gcOk : YAFFS_OK;
 }
@@ -6690,17 +6708,23 @@ static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
         
         int count = 0;
 
-       if(!obj)
+       if(!obj){
+               T(YAFFS_TRACE_ALWAYS, (TSTR("No object to verify" TENDSTR)));
                YBUG();
+       }
 
         if(yaffs_SkipVerification(obj->myDev))
                 return;
 
-       if(!obj->parent)
+       if(!obj->parent){
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Object does not have parent" TENDSTR)));
                YBUG();
+       }
                
-       if(obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+       if(obj->parent->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Parent is not directory" TENDSTR)));
                YBUG();
+       }
        
         /* Iterate through the objects in each hash entry */
          
@@ -6713,9 +6737,10 @@ static void yaffs_VerifyObjectInDirectory(yaffs_Object *obj)
                 }
         }
         
-        if(count != 1)
-               YBUG();
-        
+        if(count != 1){
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory %d times" TENDSTR),count));
+               YBUG();
+       }
 
 }
 
@@ -6728,20 +6753,24 @@ static void yaffs_VerifyDirectory(yaffs_Object *directory)
        if(!directory)
                YBUG();
 
-        if(yaffs_SkipVerification(directory->myDev))
+        if(yaffs_SkipFullVerification(directory->myDev))
                 return;
 
                
-       if(directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY)
+       if(directory->variantType != YAFFS_OBJECT_TYPE_DIRECTORY){
+               T(YAFFS_TRACE_ALWAYS, (TSTR("Directory has wrong type: %d" TENDSTR),directory->variantType));
                YBUG();
+       }
        
         /* Iterate through the objects in each hash entry */
          
         ylist_for_each(lh, &directory->variant.directoryVariant.children) {
                if (lh) {
                         listObj = ylist_entry(lh, yaffs_Object, siblings);
-                       if(listObj->parent != directory)
+                       if(listObj->parent != directory){
+                               T(YAFFS_TRACE_ALWAYS, (TSTR("Object in directory list has wrong parent" TENDSTR),listObj->parent));
                                YBUG();
+                       }
                        yaffs_VerifyObjectInDirectory(listObj);
                 }
         }
@@ -7222,6 +7251,8 @@ int yaffs_GutsInitialise(yaffs_Device * dev)
        dev->blockOffset = 0;
        dev->chunkOffset = 0;
        dev->nFreeChunks = 0;
+       
+       dev->gcBlock = -1;
 
        if (dev->startBlock == 0) {
                dev->internalStartBlock = dev->startBlock + 1;