Changeset 32277

Timestamp:

Sep 1, 2011, 9:56:44 AM (15 years ago)

Author:

bills

Message:

m Gene: in BLOCKSET_LOCK when nextBlock or previousBlock are inFlight, check for memory corruption.
This has been running in the production build for awhile.

File:

• tags/ipp-20110622/psLib/src/sys/psMemory.c (modified) (1 diff, 1 prop)

tags/ipp-20110622/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!