[ros-diffs] [fireball] 33659: - Revert 32675 (enabling usage of the cache bitmap). It was just hiding the real bug fixed in r33633, and the bitmap code seems to not be finished (e.g. "out of CacheSeg space" bug).

[fireball at svn.reactos.org]

Author: fireball
Date: Fri May 23 09:40:50 2008
New Revision: 33659

URL: http://svn.reactos.org/svn/reactos?rev=33659&view=rev
Log:
- Revert 32675 (enabling usage of the cache bitmap). It was just hiding the real bug fixed in r33633, and the bitmap code seems to not be finished (e.g. "out of CacheSeg space" bug).

Modified:
    trunk/reactos/ntoskrnl/cc/view.c

Modified: trunk/reactos/ntoskrnl/cc/view.c
URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/cc/view.c?rev=33659&r1=33658&r2=33659&view=diff
==============================================================================
--- trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] (original)
+++ trunk/reactos/ntoskrnl/cc/view.c [iso-8859-1] Fri May 23 09:40:50 2008
@@ -47,7 +47,7 @@
  * over a bitmap. If CACHE_BITMAP is used, the size of the mdl mapping region
  * must be reduced (ntoskrnl\mm\mdl.c, MI_MDLMAPPING_REGION_SIZE).
  */
-#define CACHE_BITMAP
+//#define CACHE_BITMAP
 
 static LIST_ENTRY DirtySegmentListHead;
 static LIST_ENTRY CacheSegmentListHead;
@@ -58,7 +58,7 @@
 KGUARDED_MUTEX ViewLock;
 
 #ifdef CACHE_BITMAP
-#define	CI_CACHESEG_MAPPING_REGION_SIZE	(256*1024*1024)
+#define	CI_CACHESEG_MAPPING_REGION_SIZE	(128*1024*1024)
 
 static PVOID CiCacheSegMappingRegionBase = NULL;
 static RTL_BITMAP CiCacheSegMappingRegionAllocMap;
@@ -564,12 +564,10 @@
   PCACHE_SEGMENT current;
   PCACHE_SEGMENT previous;
   PLIST_ENTRY current_entry;
+  NTSTATUS Status;
   KIRQL oldIrql;
 #ifdef CACHE_BITMAP
   ULONG StartingOffset;
-#else
-  ULONG_PTR GuardArea;
-  NTSTATUS Status;
 #endif
   PHYSICAL_ADDRESS BoundaryAddressMultiple;
 
@@ -679,8 +677,7 @@
      KEBUGCHECKCC;
   }
 
-  current->BaseAddress = (PVOID)((ULONG_PTR)CiCacheSegMappingRegionBase +
-      StartingOffset * PAGE_SIZE);
+  current->BaseAddress = CiCacheSegMappingRegionBase + StartingOffset * PAGE_SIZE;
 
   if (CiCacheSegMappingRegionHint == StartingOffset)
   {
@@ -889,7 +886,7 @@
   for (i = 0; i < RegionSize; i++)
     {
       MmDeleteVirtualMapping(NULL,
-			     (PVOID)((ULONG_PTR)CacheSeg->BaseAddress + (i * PAGE_SIZE)),
+			     CacheSeg->BaseAddress + (i * PAGE_SIZE),
 			     FALSE,
 			     NULL,
 			     &Page);
@@ -898,8 +895,7 @@
 
   KeAcquireSpinLock(&CiCacheSegMappingRegionLock, &oldIrql);
   /* Deallocate all the pages used. */
-  Base = ((ULONG_PTR)CacheSeg->BaseAddress -
-      (ULONG_PTR)CiCacheSegMappingRegionBase) / PAGE_SIZE;
+  Base = (ULONG)(CacheSeg->BaseAddress - CiCacheSegMappingRegionBase) / PAGE_SIZE;
 
   RtlClearBits(&CiCacheSegMappingRegionAllocMap, Base, RegionSize);