equal
deleted
inserted
replaced
1516 verifySpread = EFalse; |
1516 verifySpread = EFalse; |
1517 } |
1517 } |
1518 } |
1518 } |
1519 else |
1519 else |
1520 { |
1520 { |
1521 if ((allocMov || allocDis) && prevZoneNotFull) |
1521 if (verifySpread && (allocMov || allocDis) && prevZoneNotFull) |
1522 {// The previous least preferable RAM zones were not full so shouldn't |
1522 {// The previous least preferable RAM zones were not full so shouldn't |
1523 // be any movable or discardable pages in the RAM zones of this preference. |
1523 // be any movable or discardable pages in the RAM zones of this preference. |
1524 test.Printf(_L("Movable or discardable pages in more preferable RAM zones unnecessarily\n")); |
1524 test.Printf(_L("Movable or discardable pages in more preferable RAM zones unnecessarily\n")); |
1525 return KErrGeneral; |
1525 return KErrGeneral; |
1526 } |
1526 } |
3051 if (zoneIndexCand == KInvalidCandIndex) |
3051 if (zoneIndexCand == KInvalidCandIndex) |
3052 { |
3052 { |
3053 break; |
3053 break; |
3054 } |
3054 } |
3055 totMov -= gZoneUtilArray[zoneIndexCand].iAllocMovable; |
3055 totMov -= gZoneUtilArray[zoneIndexCand].iAllocMovable; |
3056 if (gZoneUtilArray[zoneIndexCand].iFreePages != gZoneUtilArray[zoneIndexCand].iPhysPages && |
3056 if (gZoneUtilArray[zoneIndexCand].iFreePages && |
3057 gZoneUtilArray[zoneIndexCand].iFreePages != 0) |
3057 (gZoneUtilArray[zoneIndexCand].iAllocMovable || |
|
3058 gZoneUtilArray[zoneIndexCand].iAllocDiscardable)) |
3058 { |
3059 { |
3059 zoneNotEmptyOrFull = ETrue; |
3060 zoneNotEmptyOrFull = ETrue; |
3060 } |
3061 } |
3061 } |
3062 } |
3062 prefIndex -= candIndex - 1 ; |
3063 prefIndex -= candIndex - 1 ; |