Changeset 11672 for trunk/psLib/src/sys/psMemory.c

Timestamp:

Feb 6, 2007, 2:36:02 PM (19 years ago)

Author:

jhoblitt

Message:

remove all use of psType.h types -- psMemory.h now has no ps*.h dependencies
remove "const void *" functions parameters because of sporadic compilation warnings

File:

• trunk/psLib/src/sys/psMemory.c (modified) (15 diffs)

trunk/psLib/src/sys/psMemory.c

@@ -10 +10 @@
 *  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.92 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-02-03 05:54:08 $
+*  @version $Revision: 1.93 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-02-07 00:36:02 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -109 +109 @@
  *  Default memExhausted callback.
  */
-static psPtr memExhaustedCallbackDefault(size_t size)
+static void *memExhaustedCallbackDefault(size_t size)
 {
     return NULL;
@@ -403 +403 @@
  * Actually allocate memory
  */
-psPtr p_psAlloc(size_t size,
+void *p_psAlloc(size_t size,
                 const char *file,
                 unsigned int lineno,
@@ -409 +409 @@
 {
 
-    psMemBlock *memBlock = malloc(sizeof(psMemBlock) + size + sizeof(psPtr));
+    psMemBlock *memBlock = malloc(sizeof(psMemBlock) + size + sizeof(void *));
     if (memBlock == NULL) {
         MUTEX_LOCK(&memBlockListMutex);
@@ -490 +490 @@
 }
 
-psPtr p_psRealloc(psPtr ptr,
+void *p_psRealloc(void *ptr,
                   size_t size,
                   const char *file,
@@ -516 +516 @@
     bool isBlockLast = (memBlock == lastMemBlockAllocated);
 
-    memBlock = (psMemBlock *)realloc(memBlock, sizeof(psMemBlock) + size + sizeof(psPtr));
+    memBlock = (psMemBlock *)realloc(memBlock, sizeof(psMemBlock) + size + sizeof(void *));
     if (memBlock== NULL) {
         MUTEX_LOCK(&memBlockListMutex);
@@ -680 +680 @@
 
 // return refCounter
-psReferenceCount p_psMemGetRefCounter(const psPtr ptr,
+psReferenceCount p_psMemGetRefCounter(void *ptr,
                                       const char *file,
                                       unsigned int lineno,
@@ -697 +697 @@
 
 // increment and return refCounter
-psPtr p_psMemIncrRefCounter(const psPtr ptr,
+void *p_psMemIncrRefCounter(void *ptr,
                             const char *file,
                             unsigned int lineno,
@@ -723 +723 @@
 
 #if 0
-psPtr p_psMemSetRefCounter(psPtr vptr,
-                           psReferenceCount count,
-                           const char *file,
-                           psS32 lineno)
+void * p_psMemSetRefCounter(void * vptr,
+                            psReferenceCount count,
+                            const char *file,
+                            psS32 lineno)
 {
     psMemBlock* ptr;
@@ -756 +756 @@
 
 // decrement and return refCounter
-psPtr p_psMemDecrRefCounter(psPtr ptr,
+void *p_psMemDecrRefCounter(void * ptr,
                             const char *file,
                             unsigned int lineno,
@@ -823 +823 @@
 }
 
-void p_psMemSetDeallocator(psPtr ptr,
+void p_psMemSetDeallocator(void *ptr,
                            psFreeFunc freeFunc,
                            const char *file,
@@ -840 +840 @@
 }
 
-psFreeFunc p_psMemGetDeallocator(const psPtr ptr,
+psFreeFunc p_psMemGetDeallocator(void *ptr,
                                  const char *file,
                                  unsigned int lineno,
@@ -879 +879 @@
 }
 
-bool p_psMemGetPersistent(psPtr ptr,
+bool p_psMemGetPersistent(void *ptr,
                           const char *file,
                           unsigned int lineno,
@@ -895 +895 @@
 }
 
-void p_psMemSetPersistent(psPtr ptr,
+void p_psMemSetPersistent(void *ptr,
                           bool value,
                           const char *file,
@@ -924 +924 @@
                   size_t *persistent) // persistent memory that's currently allocated
 {
-    const size_t overhead = sizeof(psMemBlock) + sizeof(psPtr); // overhead on each allocation
+    const size_t overhead = sizeof(psMemBlock) + sizeof(void *); // overhead on each allocation
 
     if (print) {