Changeset 15507 for S60/trunk/MemoryManager

Timestamp:

07/18/06 13:22:45 (2 years ago)

Author:

brmorris

Message:

2006-07-17 Bradley <bradley.morrison@nokia.com>

Reviewed by Sachin/Zalan.

Various fixes - see ChangeLogs for details.
Part 1 of 4.

Location:

S60/trunk/MemoryManager

Files:

• ChangeLog (modified) (1 diff)
• Src/Allocator.cpp (modified) (2 diffs)
• Src/fast_malloc.cpp (modified) (5 diffs)

S60/trunk/MemoryManager/ChangeLog

@@ +1 @@
+2006-07-18  brmorris  <bradley.morrison@nokia.com>
+
+        Reviewed by Zala/Sachin.
+
+        * Src/Allocator.cpp: Removed unused vars
+        (CAllocator::PreCheck):
+        (CAllocator::CollectMemory):
+        * Src/StopScheduler.cpp: Removed unused vars
+        * Src/fast_malloc.cpp: Removed unused vars
+        (check_system_heap):
+
 2006-06-04  Zalan  <zalan.bujtas@nokia.com>
 

S60/trunk/MemoryManager/Src/Allocator.cpp

@@ -137 +137 @@
 TBool CAllocator::PreCheck( TUint aTotalSize, TUint aMaxBufSize, const TDesC8& /*aCheckerName*/ )
     {
-    TBool ret = EFalse;
     iNestedChecks++;
 
@@ -193 +192 @@
 
     iIsCollecting = ETrue;
-    TUint collected = 0;
     for( TInt i=0; i<iCollectors.Count(); ++i )
       {

S60/trunk/MemoryManager/Src/fast_malloc.cpp

@@ -4804 +4804 @@
 TInt check_system_heap()
 {
-    TInt block;
     TInt freeMem = 0; //User::Available( block );
     
@@ -4870 +4869 @@
             
             MEM_LOGF( _L8("WaterMark: %d  SafeTop: %d ChunkTop: %d"), 
-                  (size_t)watermark-(size_t)rchunk.Base(), 
-                  (size_t)safetop-(size_t)rchunk.Base(), 
-                  rchunk.Top() );
+                (size_t)watermark-(size_t)rchunk.Base(), 
+                (size_t)safetop-(size_t)rchunk.Base(), 
+                rchunk.Top() );
         
             return oldmark;
@@ -4932 +4931 @@
 void log_abort( const char* file, unsigned int line)
 {
-        TPtrC8 des( (unsigned char*)file, strlen(file) );
-        MEM_LOGF( _L8("Abort at %S line %d"), des, line );
-        User::After( 500000 );
-        User::Panic( _L("fast_malloc"), 0 );
+  TPtrC8 des( (unsigned char*)file, strlen(file) );
+  MEM_LOGF( _L8("Abort at %S line %d"), des, line );
+  User::After( 500000 );
+  User::Panic( _L("fast_malloc"), 0 );
 }
 
@@ -4981 +4980 @@
         safetop = (void*)( (int)safetop + req );
         MEM_LOGF( _L8("precheck... WaterMark: %d  SafeTop: %d ChunkTop: %d"), 
-                                (size_t)watermark-(size_t)rchunk.Base(), 
-                                (size_t)safetop-(size_t)rchunk.Base(), 
-                                rchunk.Top() );
+              (size_t)watermark-(size_t)rchunk.Base(), 
+              (size_t)safetop-(size_t)rchunk.Base(), 
+              rchunk.Top() );
     }
     else
@@ -5008 +5007 @@
         
         MEM_LOGF( _L8("postcheck... WaterMark: %d  SafeTop: %d ChunkTop: %d"), 
-                        (size_t)watermark-(size_t)rchunk.Base(), 
-                        (size_t)safetop-(size_t)rchunk.Base(), 
-                        rchunk.Top() );
+            (size_t)watermark-(size_t)rchunk.Base(), 
+            (size_t)safetop-(size_t)rchunk.Base(), 
+            rchunk.Top() );
     }
 }