yaffs-ecoscentric-gpl: yaffs

comparison yaffs_guts.c @ 383:b9e2ee9e8f28

Faster block iteration where all blocks are being checked

author	charles <charles>
date	Fri, 12 Mar 2010 02:48:34 +0000
parents	f85ba1a6e018
children	36569f389824

comparison

equal deleted inserted replaced

-:f85ba1a6e018
+:b9e2ee9e8f28
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation.
 */
 const char *yaffs_guts_c_version =
-"$Id: yaffs_guts.c,v 1.118 2010-03-12 01:22:48 charles Exp $";
+"$Id: yaffs_guts.c,v 1.119 2010-03-12 02:48:34 charles Exp $";
 #include "yportenv.h"
 #include "yaffs_trace.h"
 #include "yaffsinterface.h"
 */
 static int yaffs_CalcOldestDirtySequence(yaffs_Device *dev)
 {
 	int i;
 	__u32 seq;
-	yaffs_BlockInfo *b = 0;
+	yaffs_BlockInfo *b;
 	if(!dev->param.isYaffs2)
 		return 0;
 	/* Find the oldest dirty sequence number. */
 	seq = dev->sequenceNumber;
+	b = dev->blockInfo;
 	for (i = dev->internalStartBlock; i <= dev->internalEndBlock; i++) {
-		b = yaffs_GetBlockInfo(dev, i);
 		if (b->blockState == YAFFS_BLOCK_STATE_FULL &&
 		    (b->pagesInUse - b->softDeletions) < dev->param.nChunksPerBlock &&
 		    b->sequenceNumber < seq)
 				seq = b->sequenceNumber;
+		b++;
 	}
 	return seq;
 }
 	 * We'll do a refresh this time around....
 	 * Update the refresh skip and find the oldest block.
 	 */
 	dev->refreshSkip = dev->param.refreshPeriod;
 	dev->refreshCount++;
+	bi = dev->blockInfo;
 	for (b = dev->internalStartBlock; b <=dev->internalEndBlock; b++){
-		bi = yaffs_GetBlockInfo(dev, b);
 		if (bi->blockState == YAFFS_BLOCK_STATE_FULL){
 			if(oldest < 1 ||
 bi->sequenceNumber < oldestSequence){
 oldest = b;
 oldestSequence = bi->sequenceNumber;
 }
 		}
+		bi++;
 	}
 	if (oldest > 0) {
 		T(YAFFS_TRACE_GC,
 		  (TSTR("GC refresh count %d selected block %d with sequenceNumber %d" TENDSTR),
 	yaffs_BlockInfo *bi;
 	int pendingPrioritisedExist = 0;
 	/* First let's see if we need to grab a prioritised block */
 	if (dev->hasPendingPrioritisedGCs) {
+		bi = dev->blockInfo;
 		for (i = dev->internalStartBlock; i < dev->internalEndBlock && !prioritised; i++) {
-			bi = yaffs_GetBlockInfo(dev, i);
-			/* yaffs_VerifyBlock(dev,bi,i); */
 			if (bi->gcPrioritise) {
 				pendingPrioritisedExist = 1;
 				if (bi->blockState == YAFFS_BLOCK_STATE_FULL &&
 				   yaffs_BlockNotDisqualifiedFromGC(dev, bi)) {
 					dirtiest = i;
 					prioritised = 1;
 					aggressive = 1; /* Fool the non-aggressive skip logiv below */
 				}
 			}
+			bi++;
 		}
 		if (!pendingPrioritisedExist) /* None found, so we can clear this */
 			dev->hasPendingPrioritisedGCs = 0;
 	}
 	chunkData = yaffs_GetTempBuffer(dev, __LINE__);
 	dev->sequenceNumber = YAFFS_LOWEST_SEQUENCE_NUMBER;
 	/* Scan all the blocks to determine their state */
+	bi = dev->blockInfo;
 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-		bi = yaffs_GetBlockInfo(dev, blk);
 		yaffs_ClearChunkBits(dev, blk);
 		bi->pagesInUse = 0;
 		bi->softDeletions = 0;
 		yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
 			T(YAFFS_TRACE_SCAN_DEBUG,
 			  (TSTR("Block empty " TENDSTR)));
 			dev->nErasedBlocks++;
 			dev->nFreeChunks += dev->param.nChunksPerBlock;
 		}
+		bi++;
 	}
 	startIterator = dev->internalStartBlock;
 	endIterator = dev->internalEndBlock;
 	dev->blocksInCheckpoint = 0;
 	chunkData = yaffs_GetTempBuffer(dev, __LINE__);
 	/* Scan all the blocks to determine their state */
+	bi = dev->blockInfo;
 	for (blk = dev->internalStartBlock; blk <= dev->internalEndBlock; blk++) {
-		bi = yaffs_GetBlockInfo(dev, blk);
 		yaffs_ClearChunkBits(dev, blk);
 		bi->pagesInUse = 0;
 		bi->softDeletions = 0;
 		yaffs_QueryInitialBlockState(dev, blk, &state, &sequenceNumber);
 				   ("Block scanning block %d has bad sequence number %d"
 				    TENDSTR), blk, sequenceNumber));
 			}
 		}
+		bi++;
 	}
 	T(YAFFS_TRACE_SCAN,
 	(TSTR("%d blocks to be sorted..." TENDSTR), nBlocksToScan));
 	}
 }
 static int yaffs_CountFreeChunks(yaffs_Device *dev)
 {
-	int nFree;
+	int nFree=0;
 	int b;
 	yaffs_BlockInfo *blk;
-	for (nFree = 0, b = dev->internalStartBlock; b <= dev->internalEndBlock;
+	blk = dev->blockInfo;
-			b++) {
+	for (b = dev->internalStartBlock; b <= dev->internalEndBlock; b++) {
-		blk = yaffs_GetBlockInfo(dev, b);
 		switch (blk->blockState) {
 		case YAFFS_BLOCK_STATE_EMPTY:
 		case YAFFS_BLOCK_STATE_ALLOCATING:
 		case YAFFS_BLOCK_STATE_COLLECTING:
 		case YAFFS_BLOCK_STATE_FULL:
 			     blk->softDeletions);
 			break;
 		default:
 			break;
 		}
+		blk++;
 	}
 	return nFree;
 }

Mercurial > yaffs-ecoscentric-gpl

comparison yaffs_guts.c @ 383:b9e2ee9e8f28