Changeset 21302 for trunk/src/kernel32/os2heap.cpp

Timestamp:

Jun 18, 2009, 11:53:26 AM (16 years ago)

Author:

ydario

Message:

Kernel32 updates.

File:

• trunk/src/kernel32/os2heap.cpp (modified) (5 diffs)

trunk/src/kernel32/os2heap.cpp

@@ -41 +41 @@
 #include "dbglocal.h"
 
+#include <_ras.h>
+
+#ifdef RAS
+RAS_TRACK_HANDLE rthHeap = 0;
+#endif
+
 #ifndef HEAP_NO_SERIALIZE
   #define HEAP_NO_SERIALIZE 1
@@ -94 +100 @@
     else  heap = this;
     next = NULL;
+
+#ifdef RAS
+    if (!rthHeap)
+    {
+        RasRegisterObjectTracking (&rthHeap, "Heap*, Global* and Local* memory",
+                                   0, RAS_TRACK_FLAG_MEMORY | RAS_TRACK_FLAG_LOG_AT_EXIT, 
+                                   NULL, NULL);
+    }
+#endif
 
     heaplistmutex.leave();
@@ -173 +188 @@
         return(NULL);
     }
+    
+    RasTrackMemAlloc (rthHeap, dwAllocBytes);
+    
     if(dwFlags & HEAP_ZERO_MEMORY) {
         memset(lpMem, 0, dwAllocBytes+HEAP_OVERHEAD);
@@ -238 +256 @@
     if (dwBytes <= maxSize) {
         dprintf(("ReAlloc with smaller size than original (%d); return old pointer", maxSize));
+        
+        RasTrackMemRealloc (rthHeap, helem->cursize, dwBytes);
+        
         //update current size so HeapSize will return the right value
         helem->cursize = dwBytes;  
@@ -280 +301 @@
 #endif
 
+    RasTrackMemFree (rthHeap, helem->cursize);
+
     free(helem->lpMem);
+    
     return(TRUE);
 }