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

Timestamp:

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

Author:

ydario

Message:

Kernel32 updates.

File:

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

trunk/src/kernel32/heapshared.cpp

@@ -17 +17 @@
 #define INCL_BASE
 #define INCL_DOSMEMMGR
+#define INCL_DOSPROCESS
 #include <os2wrap.h>
 #include <string.h>
 #include <dbglog.h>
-#include <heapshared.h>
+#include <stddef.h>
+#include <stdlib.h>
+#include <umalloc.h>
 #include "initterm.h"
+
+#define PAGE_SIZE               4096
 
 #define DBG_LOCALLOG    DBG_heapshared
@@ -102 +107 @@
 //******************************************************************************
 //******************************************************************************
+#ifdef DEBUG
+int _LNK_CONV callback_function(const void *pentry, size_t sz, int useflag, int status,
+                                const char *filename, size_t line)
+{
+    if (_HEAPOK != status) {
+       dprintf(("status is not _HEAPOK."));
+       return 1;
+    }
+    if (_USEDENTRY == useflag && sz && filename && line) {
+         dprintf(("allocated  %08x %u at %s %d\n", pentry, sz, filename, line));
+    }
+    else dprintf(("allocated  %08x %u", pentry, sz));
+
+    return 0;
+}
+#endif
+//******************************************************************************
+//******************************************************************************
 void SYSTEM DestroySharedHeap()
 {
@@ -108 +131 @@
         return;
     }
+
+#ifdef DEBUG
+    _uheap_walk(sharedHeap, callback_function);
+    dprintf((NULL));
+#endif
+
     if(--refCount == 0) {
             if(sharedHeap) {
@@ -200 +229 @@
 
     chunk = _umalloc(sharedHeap, size);
-    dprintf2(("_smalloc %x returned %x", size, chunk));
+    dprintf(("_smalloc %x returned %x", size, chunk));
     return chunk;
 }
@@ -213 +242 @@
         memset(chunk, 0, size);
     }
-    dprintf2(("_smallocfill %x %x returned %x", size, filler, chunk));
-    return chunk;
-}
-//******************************************************************************
-//******************************************************************************
+    dprintf(("_smallocfill %x %x returned %x", size, filler, chunk));
+    return chunk;
+}
+//******************************************************************************
+//******************************************************************************
+void SYSTEM _sfree(void *block)
+{
+    dprintf(("_sfree %x", block));
+    free(block);
+}
+//******************************************************************************
+//******************************************************************************
+void * _System _debug_smalloc(int size, char *pszFile, int linenr)
+{
+    void *chunk;
+
+#ifdef __DEBUG_ALLOC__
+    chunk = _debug_umalloc(sharedHeap, size, pszFile, linenr);
+#else
+    chunk = _umalloc(sharedHeap, size);
+#endif
+    dprintf(("_smalloc %x returned %x", size, chunk));
+    return chunk;
+}
+//******************************************************************************
+//******************************************************************************
+void * _System _debug_smallocfill(int size, int filler, char *pszFile, int linenr)
+{
+    void *chunk;
+
+#ifdef __DEBUG_ALLOC__
+    chunk =  _debug_umalloc(sharedHeap, size, pszFile, linenr);
+#else
+    chunk =  _umalloc(sharedHeap, size);
+#endif
+    if(chunk) {
+        memset(chunk, 0, size);
+    }
+    dprintf(("_smallocfill %x %x returned %x", size, filler, chunk));
+    return chunk;
+}
+//******************************************************************************
+//******************************************************************************
+void   _System _debug_sfree(void *chunk, char *pszFile, int linenr)
+{
+    dprintf(("_sfree %x", chunk));
+#ifdef __DEBUG_ALLOC__
+    _debug_free(chunk, pszFile, linenr);
+#else
+    free(chunk);
+#endif
+}
+//******************************************************************************
+//******************************************************************************