MCL/sf/os/kernelhwsrv: comparison userlibandfileserver/fileserver/sfile/sf_memory

equal deleted inserted replaced

-:a179b74831c9
+:c1f20ce4abcf
 ASSERT(0);
 }
 	iTouchedRegionFlag = 0;
 	iReusablePagePool.Close();
-	iReusablePagePool.Reserve(iReservedRegionMarkInSegs);
+	r = iReusablePagePool.Reserve(iReservedRegionMarkInSegs);
 if (r != KErrNone)
 {
 ASSERT(0);
 }
 	}
 	iTouchedRegionFlag += aSegmentCount;
 //       	__PRINT3(_L("!! USED RESERVED SEGS: addr=0x%x, touched=%d, reserved=%d"), addr, iTouchedRegionFlag, iReservedRegionMarkInSegs);
 	return addr;
 	}
-	// if we have used up reserved region, get new pages from reusable pool first
+TBool touchedMore = EFalse;
+	// if we have touched beyond reserved region, get new pages from reusable pool first
 if (iReusablePagePool.Count())
 	{
 		addr = iReusablePagePool[0];
 		iReusablePagePool.Remove(0);
 //       	__PRINT2(_L("!! USED REUSABLE POOL SEGS: addr=0x%x, reusable.Count()=%d"), addr, iReusablePagePool.Count());
 	}
 // or we grow the touched region flag
 else
 	{
 	addr = iBase + (iTouchedRegionFlag << iSegSizeInBytesLog2);
-	iTouchedRegionFlag += aSegmentCount;
+	touchedMore = ETrue;
 //       	__PRINT2(_L("!! GROW TOUCHED SEGS: addr=0x%x, touched=%d"), addr, iTouchedRegionFlag);
 	}
 // parameter validation
 ASSERT(((addr - iBase) >> iSegSizeInBytesLog2) + aSegmentCount <= iMaxSizeInSegs);
 TInt r = iManager.AllocateAndLockSegments(addr, aSegmentCount);
 	if (r != KErrNone)
 		return NULL;
+	if (touchedMore)
+	    {
+	    iTouchedRegionFlag += aSegmentCount;
+	    }
 	return addr;
 	}
 /**
 Decommit a set of contiguous segments.

branch	RCL_3
changeset 43	c1f20ce4abcf
parent 42	a179b74831c9
child 44	3e88ff8f41d5