Changeset 32713

Timestamp:

Nov 18, 2011, 4:29:55 PM (15 years ago)

Author:

eugene

Message:

do not run possibly invalid test code in psMemory.c

File:

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

trunk/psLib/src/sys/psMemory.c

@@ -384 +384 @@
 // pointer to the last mem block that was allocated.
 // This is the root of the entire memory list
-static psMemBlock *lastMemBlockAllocated = NULL;
+static volatile psMemBlock *lastMemBlockAllocated = NULL;
 
 // set lock on lastMemBlockAllocated
@@ -655 +655 @@
     memBlock->refCounter = 1;                   // one user so far
 
-    psMemBlock *last0 = lastMemBlockAllocated;
-    int flight0 = (lastMemBlockAllocated) ? lastMemBlockAllocated->inFlight : 10;
+    // XXX these lines are test lines that potentially access invalid memory
+    // XXX psMemBlock *last0 = lastMemBlockAllocated;
+    // XXX int flight0 = (lastMemBlockAllocated) ? lastMemBlockAllocated->inFlight : 10;
 
     // need exclusive access of the memory block list now...
@@ -663 +664 @@
     BLOCKLAST_LOCK ();
 
-    psMemBlock *last1 = lastMemBlockAllocated;
-    int flight1 = (lastMemBlockAllocated) ? lastMemBlockAllocated->inFlight : 10;
-
-    if (false) {
-        fprintf (stderr, "last 0 : %lld, last 1 : %lld, flight0: %d, flight1: %d\n", (long long int) last0, (long long int) last1, (int) flight0, (int) flight1);
-    }
+    // XXX psMemBlock *last1 = lastMemBlockAllocated;
+    // XXX int flight1 = (lastMemBlockAllocated) ? lastMemBlockAllocated->inFlight : 10;
+
+    // XXX if (false) {
+    // XXX      fprintf (stderr, "last 0 : %lld, last 1 : %lld, flight0: %d, flight1: %d\n", (long long int) last0, (long long int) last1, (int) flight0, (int) flight1);
+    // XXX }
 
     // increment the memory id only after we've grabbed the memBlockListMutex this value is