Changeset 10940

Timestamp:

Jan 5, 2007, 11:26:52 AM (19 years ago)

Author:

jhoblitt

Message:

convert P_PS_MEMMAGIC from a psPTR to a psU32 to save memory on 64bit platforms

Location:

branches/jch-memory/psLib/src/sys

Files:

• psAssert.h (modified) (1 diff)
• psMemory.c (modified) (6 diffs)
• psMemory.h (modified) (4 diffs)

branches/jch-memory/psLib/src/sys/psAssert.h

@@ -16 +16 @@
     psMemBlock *mb = (psMemBlock*)(NAME) - 1; \
     if (mb->startblock != P_PS_MEMMAGIC || mb->endblock != P_PS_MEMMAGIC || \
-            *(psPtr *)((int8_t *) (mb + 1) + mb->userMemorySize) != P_PS_MEMMAGIC) { \
+            *(psU32 *)((char *)(mb + 1) + mb->userMemorySize) != P_PS_MEMMAGIC) { \
         psError(PS_ERR_MEMORY_CORRUPTION, false, \
                 "Error: Pointer %s is corrupted or not on the PS memory system.", \

branches/jch-memory/psLib/src/sys/psMemory.c

@@ -10 +10 @@
 *  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.88.2.20 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-01-05 04:36:19 $
+*  @version $Revision: 1.88.2.21 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-01-05 21:26:52 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -175 +175 @@
     }
 
-    if (*(psPtr *)((int8_t *) (memBlock + 1) + memBlock->userMemorySize) != P_PS_MEMMAGIC) {
+    if (*(psU32 *)((char *)(memBlock + 1) + memBlock->userMemorySize) != P_PS_MEMMAGIC) {
         if (!blockPrinted) {
             psMemBlockPrint(output, memBlock);
@@ -407 +407 @@
 
     // posts
-    *(psPtr*)&memBlock->startblock = P_PS_MEMMAGIC;
-    *(psPtr*)&memBlock->endblock = P_PS_MEMMAGIC;
-    *(psPtr *)((int8_t *) (memBlock + 1) + size) = P_PS_MEMMAGIC;
+    *(psU32 *)&memBlock->startblock = P_PS_MEMMAGIC;
+    *(psU32 *)&memBlock->endblock   = P_PS_MEMMAGIC;
+    *(psU32 *)((char *) (memBlock + 1) + size) = P_PS_MEMMAGIC;
 
     // size of memory allocated
@@ -507 +507 @@
 
     memBlock->userMemorySize = size;
-    *(psPtr *)((int8_t *) (memBlock + 1) + size) = P_PS_MEMMAGIC;
+    *(psU32 *)((char *)(memBlock + 1) + size) = P_PS_MEMMAGIC;
 
     MUTEX_LOCK(&memBlockListMutex);
@@ -1058 +1058 @@
                    "\tFree function: %p\n"
                    "\tSize: %zd Reference count: %lu Persistent: %s\n"
-                   "\tPosts: %p %p %p\n"
+                   "\tPosts: %x %x %x\n"
                    "\tAllocated in %s at (%s:%d)\n"
                    "\t\tby Thread ID %lu\n",
@@ -1066 +1066 @@
                    memBlock->userMemorySize, memBlock->refCounter, (memBlock->persistent ? "Yes" : "No"),
                    memBlock->startblock, memBlock->endblock,
-                   *(psPtr *)((int8_t *) (memBlock + 1) + memBlock->userMemorySize),
+                   *(psU32 *)((char *) (memBlock + 1) + memBlock->userMemorySize),
                    memBlock->func, memBlock->file, memBlock->lineno, memBlock->tid);
 }

branches/jch-memory/psLib/src/sys/psMemory.h

@@ -14 +14 @@
  *  @ingroup MemoryManagement
  *
- *  @version $Revision: 1.61.2.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-01-05 04:36:19 $
+ *  @version $Revision: 1.61.2.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2007-01-05 21:26:52 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
  */
 
-#define P_PS_MEMMAGIC (psPtr)0xdeadbeef   // Magic number in psMemBlock header
+#define P_PS_MEMMAGIC (psU32)0xdeadbeef   // Magic number in psMemBlock header
 
 /**
@@ -68 +68 @@
 typedef struct psMemBlock
 {
-    const void* startblock;            ///< initialised to p_psMEMMAGIC
+    const psU32 startblock;            ///< initialised to p_psMEMMAGIC
     struct psMemBlock* previousBlock;  ///< previous block in allocation list
     struct psMemBlock* nextBlock;      ///< next block allocation list
@@ -80 +80 @@
     psReferenceCount refCounter;       ///< how many times pointer is referenced
     bool persistent;                   ///< marks if this non-user persistent data like error stack, etc.
-    const void* endblock;              ///< initialised to p_psMEMMAGIC
+    const psU32 endblock;              ///< initialised to p_psMEMMAGIC
 }
 psMemBlock;