X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=yaffs_guts.c;h=087ac958f61f127a9c9d8c99a89d1b5e71d70fb5;hp=65e33a644b958c09b946f8a14c80d3bcbf933a05;hb=b3c7045d1ba097d7669f9b5cf4d2a6800e7ac30d;hpb=c565b5da13774bc9d5f661d93a127ba86a8769e7;ds=sidebyside

diff --git a/yaffs_guts.c b/yaffs_guts.c
index 65e33a6..087ac95 100644
--- a/yaffs_guts.c
+++ b/yaffs_guts.c
@@ -3428,8 +3428,10 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
 			int maxThreshold = dev->param.nChunksPerBlock/2;
 			threshold = background ?
 				(dev->gcNotDone + 2) * 2 : 0;
-			threshold = max(threshold, YAFFS_GC_PASSIVE_THRESHOLD);
-			threshold = min(threshold, maxThreshold);
+			if(threshold <YAFFS_GC_PASSIVE_THRESHOLD)
+				threshold = YAFFS_GC_PASSIVE_THRESHOLD;
+			if(threshold > maxThreshold)
+				threshold = maxThreshold;
 
 			iterations = nBlocks / 16 + 1;
 			if (iterations > 100)
@@ -3463,11 +3465,18 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
 			selected = dev->gcDirtiest;
 	}
 
-	if(!selected && dev->param.isYaffs2 && dev->gcNotDone >= ( background ? 10 : 20)){
+	/*
+	 * If nothing has been selected for a while, try selecting the oldest dirty
+	 * because that's gumming up the works.
+	 */
+
+	if(!selected && dev->param.isYaffs2 &&
+		dev->gcNotDone >= ( background ? 10 : 20)){
 		yaffs_FindOldestDirtySequence(dev);
 		if(dev->oldestDirtyBlock > 0) {
 			selected = dev->oldestDirtyBlock;
 			dev->gcDirtiest = selected;
+			dev->oldestDirtyGCs++;
 			bi = yaffs_GetBlockInfo(dev, selected);
 			dev->gcPagesInUse =  bi->pagesInUse - bi->softDeletions;
 		} else
@@ -3481,6 +3490,8 @@ static unsigned yaffs_FindBlockForGarbageCollection(yaffs_Device *dev,
 		  dev->param.nChunksPerBlock - dev->gcPagesInUse,
 		  prioritised));
 
+		if(background)
+			dev->backgroundGCs++;
 		dev->gcDirtiest = 0;
 		dev->gcPagesInUse = 0;
 		dev->gcNotDone = 0;
@@ -3573,9 +3584,9 @@ static int yaffs_CheckGarbageCollection(yaffs_Device *dev, int background)
 		}
 
 		if (dev->gcBlock > 0) {
-			dev->garbageCollections++;
+			dev->allGCs++;
 			if (!aggressive)
-				dev->passiveGarbageCollections++;
+				dev->passiveGCs++;
 
 			T(YAFFS_TRACE_GC,
 			  (TSTR
@@ -3603,11 +3614,11 @@ static int yaffs_CheckGarbageCollection(yaffs_Device *dev, int background)
  * Garbage collects. Intended to be called from a background thread.
  * Returns non-zero if at least half the free chunks are erased.
  */
-int yaffs_BackgroundGarbageCollect(yaffs_Device *dev)
+int yaffs_BackgroundGarbageCollect(yaffs_Device *dev, unsigned urgency)
 {
 	int erasedChunks = dev->nErasedBlocks * dev->param.nChunksPerBlock;
 
-	T(YAFFS_TRACE_BACKGROUND, (TSTR("Background gc" TENDSTR)));
+	T(YAFFS_TRACE_BACKGROUND, (TSTR("Background gc %u" TENDSTR),urgency));
 
 	yaffs_CheckGarbageCollection(dev, 1);
 	return erasedChunks > dev->nFreeChunks/2;
@@ -6760,7 +6771,7 @@ static int yaffs_ScanBackwards(yaffs_Device *dev)
 							 * the current allocation block.
 							 */
 
-							 T(YAFFS_TRACE_ALWAYS,
+							 T(YAFFS_TRACE_SCAN,
 							 (TSTR("Partially written block %d detected" TENDSTR),
 							 blk));
 						}
@@ -7905,8 +7916,10 @@ int yaffs_GutsInitialise(yaffs_Device *dev)
 	/* OK, we've finished verifying the device, lets continue with initialisation */
 
 	/* More device initialisation */
-	dev->garbageCollections = 0;
-	dev->passiveGarbageCollections = 0;
+	dev->allGCs = 0;
+	dev->passiveGCs = 0;
+	dev->oldestDirtyGCs = 0;
+	dev->backgroundGCs = 0;
 	dev->gcBlockFinder = 0;
 	dev->bufferedBlock = -1;
 	dev->doingBufferedBlockRewrite = 0;