Changeset 32339 for branches/eam_branches/ipp-20110710/psLib/src/sys/psMemory.c

Timestamp:

Sep 6, 2011, 11:02:30 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

File:

• branches/eam_branches/ipp-20110710/psLib/src/sys/psMemory.c (modified) (5 diffs)

branches/eam_branches/ipp-20110710/psLib/src/sys/psMemory.c

@@ -515 +515 @@
             continue;
         }
-        if (memBlock->nextBlock && memBlock->nextBlock->inFlight) {
-            // nope, we need to try again
-            MUTEX_UNLOCK(&memBlockListMutex);
-            usleep (BLOCK_SLEEP);
-            retryLock ++;
-            continue;
-        }
-        if (memBlock->previousBlock && memBlock->previousBlock->inFlight) {
-            // nope, we need to try again
-            MUTEX_UNLOCK(&memBlockListMutex);
-            usleep (BLOCK_SLEEP);
-            retryLock ++;
-            continue;
-        }
+        if (memBlock->nextBlock && memBlock->nextBlock->inFlight) {
+            // we reply on the value of 'inFlight'.  we should crash if this block is corrupted
+            if (memBlock->nextBlock->startblock != P_PS_MEMMAGIC) {
+                PS_MEM_ABORT(__func__, "Unsafe to Continue\n");
+            }
+            if (memBlock->nextBlock->endblock != P_PS_MEMMAGIC) {
+                PS_MEM_ABORT(__func__, "Unsafe to Continue\n");
+            }
+            // nope, we need to try again
+            MUTEX_UNLOCK(&memBlockListMutex);
+            usleep (BLOCK_SLEEP);
+            retryLock ++;
+            continue;
+        }
+        if (memBlock->previousBlock && memBlock->previousBlock->inFlight) {
+            // we reply on the value of 'inFlight'.  we should crash if this block is corrupted
+            if (memBlock->previousBlock->startblock != P_PS_MEMMAGIC) {
+                PS_MEM_ABORT(__func__, "Unsafe to Continue\n");
+            }
+            if (memBlock->previousBlock->endblock != P_PS_MEMMAGIC) {
+                PS_MEM_ABORT(__func__, "Unsafe to Continue\n");
+            }
+            // nope, we need to try again
+            MUTEX_UNLOCK(&memBlockListMutex);
+            usleep (BLOCK_SLEEP);
+            retryLock ++;
+            continue;
+        }
 
         // the markers are ours!
@@ -889 +903 @@
                       psMemBlock ***array,
                       FILE * fd,
-                      bool persistence)
+                      bool persistence,
+                      int maxDisplayedLeaksCount          ///< List at most maxDisplayedLeaksCount (-1 for all)
+                  )
 {
     psS32 nleak = 0;
@@ -896 +912 @@
 
     // XXX move this elsewhere?
-    fprintf (stderr, "set %d locks, cleared %d locks, retry on %d locks (memID %ld)\n", setLock, clearLock, retryLock, memid);
+    if (fd != NULL) {
+      fprintf (fd, "set %d locks, cleared %d locks, retry on %d locks (memID %ld)\n", setLock, clearLock, retryLock, memid);
+    }
 
     // make sure that the memblock list is free of corruption before we crawl
@@ -915 +933 @@
     for (memBlock = topBlock; memBlock->nextBlock != NULL; memBlock = memBlock->nextBlock) { }
 
+    int maxToDisplay = maxDisplayedLeaksCount;
+    psMemBlock *memBlockBackup = memBlock;
+    if (maxToDisplay == -1 ) {
+      for (; memBlock != NULL; memBlock = memBlock->previousBlock) {
+        if ( (memBlock->refCounter > 0) &&
+             ( (persistence) || (!persistence && !memBlock->persistent) ) &&
+             (memBlock->id >= id0)) {
+          nleak++;
+        }
+      }
+      maxToDisplay=nleak;
+    }
+    if (fd != NULL) {
+      fprintf(fd, "Number of leaks to display: %d\n", maxToDisplay);
+    }
+    memBlock = memBlockBackup;
+
+    nleak=0;
     // iterate through the block list starting with the oldest block
     for (; memBlock != NULL; memBlock = memBlock->previousBlock) {
@@ -924 +960 @@
 
             // only print a max of 500 leaks (make this an argument)
-            if ((nleak < 500) && (fd != NULL)) {
+            if ( (nleak <= maxToDisplay) && (fd != NULL) ) {
                 if (nleak == 1) {
                     fprintf(fd, "# func at (file:line)  ID: X  Ref: X\n");