Changeset 753 for trunk/archive/pslib/src/Utils/memory.c

Timestamp:

May 20, 2004, 6:12:37 PM (22 years ago)

Author:

eugene

Message:

substantial API changes based on change to PSLib SDRS

File:

• trunk/archive/pslib/src/Utils/memory.c (modified) (17 diffs)

trunk/archive/pslib/src/Utils/memory.c

@@ -48 +48 @@
  * First the I-can't-get-the-memory callback
  */
-static void *memExhaustedCB0(size_t size)
+static void *memExhaustedCallback0(size_t size)
 {
     return NULL;
 }
-static psMemExhaustedCB memExhaustedCB = memExhaustedCB0;
-
-psMemExhaustedCB psMemExhaustedCBSet(psMemExhaustedCB func)
-{
-    psMemExhaustedCB old = memExhaustedCB;
-
-    memExhaustedCB = (func != NULL) ? func : memExhaustedCB0;
+static psMemExhaustedCallback memExhaustedCallback = memExhaustedCallback0;
+
+psMemExhaustedCallback psMemExhaustedCallbackSet(psMemExhaustedCallback func)
+{
+    psMemExhaustedCallback old = memExhaustedCallback;
+
+    memExhaustedCallback = (func != NULL) ? func : memExhaustedCallback0;
 
     return old;
@@ -65 +65 @@
  * then the I-have-detected-a-problem callback
  */
-static void memProblemCB0(const psMemBlock *ptr,
+static void memProblemCallback0(const psMemBlock *ptr,
                           const char *file, int lineno)
 {
@@ -76 +76 @@
         fprintf(stderr, "\n");
     } else if (ptr->refCounter <= 0) {
-        psError(__func__, PS_ERR_BADFREE, PS_NEW_ERROR,
+        psError(__func__, PS_ERR_BADFREE, 1,
                 "Block %ld allocated at %s:%d freed more than once at %s:%d\n",
                 ptr->id, ptr->file, ptr->lineno, file, lineno);
     } else if (ptr->refCounter > 1) {
-        psError(__func__,  PS_ERR_BADFREE, PS_NEW_ERROR,
+        psError(__func__,  PS_ERR_BADFREE, 1,
                 "Block %ld allocated at %s:%d freed while still referenced at %s:%d\n",
                 ptr->id, ptr->file, ptr->lineno, file, lineno);
@@ -89 +89 @@
     }
 }
-static psMemProblemCB memProblemCB = memProblemCB0;
-
-psMemProblemCB psMemProblemCBSet(psMemProblemCB func)
-{
-    psMemProblemCB old = memProblemCB;
-
-    memProblemCB = (func != NULL) ? func : memProblemCB0;
+static psMemProblemCallback memProblemCallback = memProblemCallback0;
+
+psMemProblemCallback psMemProblemCallbackSet(psMemProblemCallback func)
+{
+    psMemProblemCallback old = memProblemCallback;
+
+    memProblemCallback = (func != NULL) ? func : memProblemCallback0;
 
     return old;
@@ -129 +129 @@
  * isn't resignalled)
  */
-static long memAllocateCB0(const psMemBlock *ptr)
+static long memAllocateCallback0(const psMemBlock *ptr)
 {
     static int incr = 0;                // "p_psMemAllocateID += incr"
@@ -138 +138 @@
 }
 
-static long memFreeCB0(const psMemBlock *ptr)
+static long memFreeCallback0(const psMemBlock *ptr)
 {
     static int incr = 0;                // "p_psMemFreeID += incr"
@@ -150 +150 @@
  * The default callbacks, and the routines to change them
  */
-static psMemAllocateCB memAllocateCB = memAllocateCB0;
-static psMemFreeCB memFreeCB = memFreeCB0;
-
-psMemAllocateCB psMemAllocateCBSet(psMemAllocateCB func)
-{
-    psMemAllocateCB old = memAllocateCB;
-
-    memAllocateCB = (func != NULL) ? func : memAllocateCB0;
-
-    return old;
-}
-
-psMemFreeCB psMemFreeCBSet(psMemFreeCB func)
-{
-    psMemFreeCB old = memFreeCB;
-
-    memFreeCB = (func != NULL) ? func : memFreeCB0;
+static psMemAllocateCallback memAllocateCallback = memAllocateCallback0;
+static psMemFreeCallback memFreeCallback = memFreeCallback0;
+
+psMemAllocateCallback psMemAllocateCallbackSet(psMemAllocateCallback func)
+{
+    psMemAllocateCallback old = memAllocateCallback;
+
+    memAllocateCallback = (func != NULL) ? func : memAllocateCallback0;
+
+    return old;
+}
+
+psMemFreeCallback psMemFreeCallbackSet(psMemFreeCallback func)
+{
+    psMemFreeCallback old = memFreeCallback;
+
+    memFreeCallback = (func != NULL) ? func : memFreeCallback0;
 
     return old;
@@ -194 +194 @@
     if (m == NULL) {
         if (!quiet) {
-            psError(__func__,  PS_ERR_MEMORY_CORRUPTION, PS_NEW_ERROR,
+            psError(__func__,  PS_ERR_MEMORY_CORRUPTION, 1,
                     "psMemCheckCorruption: NULL memory block\n");
         }
@@ -202 +202 @@
     if (!ALIGNED(m)) {
         if (!quiet) {
-            psError(__func__,  PS_ERR_MEMORY_CORRUPTION, PS_NEW_ERROR,
+            psError(__func__,  PS_ERR_MEMORY_CORRUPTION, 1,
                     "psMemCheckCorruption: non-aligned memory block\n");
         }
@@ -210 +210 @@
     if (m->startblock != P_PS_MEMMAGIC || m->endblock != P_PS_MEMMAGIC) {
         if (!quiet) {
-            psError(__func__, PS_ERR_MEMORY_CORRUPTION, PS_NEW_ERROR,
+            psError(__func__, PS_ERR_MEMORY_CORRUPTION, 1,
                     "psMemCheckCorruption: memory block %ld is corrupted\n", m->id);
         }
@@ -232 +232 @@
                 nbad++;
 
-                memProblemCB(memBlocks[i], "(psMemCheckCorruption)", 0);
+                memProblemCallback(memBlocks[i], "(psMemCheckCorruption)", 0);
                 
                 if (abort_on_error) {
@@ -251 +251 @@
 
     if (ptr == NULL) {
-        ptr = memExhaustedCB(size);
+        ptr = memExhaustedCallback(size);
         if (ptr == NULL) {
             psAbort(__func__, "Failed to allocate %ld bytes at %s:%d",
@@ -270 +270 @@
     
     if (ptr->id == p_psMemAllocateID && p_psMemAllocateID > 0) {
-        p_psMemAllocateID += memAllocateCB(ptr);        
+        p_psMemAllocateID += memAllocateCallback(ptr);  
     }
     /*
@@ -310 +310 @@
      */
     if (ptr->id == p_psMemFreeID && p_psMemFreeID > 0) {
-        p_psMemFreeID += memFreeCB(ptr);        
+        p_psMemFreeID += memFreeCallback(ptr);  
     }
 
     if (bad_memblock(ptr, 0)) {
-        memProblemCB(ptr, file, lineno); // we may not own this block; don't free it
+        memProblemCallback(ptr, file, lineno); // we may not own this block; don't free it
     } else {
         if (ptr->refCounter != 1) {
-            memProblemCB(ptr, file, lineno);
+            memProblemCallback(ptr, file, lineno);
         }
         ptr->refCounter--;
@@ -396 +396 @@
 
     if (bad_memblock(ptr, 0)) {
-        memProblemCB(ptr, "(psMemGetRefCounter)", -1);
+        memProblemCallback(ptr, "(psMemGetRefCounter)", -1);
     }
 
@@ -411 +411 @@
 
     if (bad_memblock(ptr, 0)) {
-        memProblemCB(ptr, "(psMemIncrRefCounter)", -1);
+        memProblemCallback(ptr, "(psMemIncrRefCounter)", -1);
     }
 
@@ -428 +428 @@
 
     if (bad_memblock(ptr, 0)) {
-        memProblemCB(ptr, "(psMemDecrRefCounter)", -1);
+        memProblemCallback(ptr, "(psMemDecrRefCounter)", -1);
     }