Changeset 829

Timestamp:

Jun 2, 2004, 10:02:42 AM (22 years ago)

Author:

desonia

Message:

Adjusted tests to the new behavior of psFree/psMemDecrRefCounter.

Location:

trunk/psLib/test/sysUtils

Files:

• tst_psMemory.c (modified) (3 diffs)
• verified/tst_psMemory.stderr (modified) (4 diffs)

trunk/psLib/test/sysUtils/tst_psMemory.c

@@ -6 +6 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-19 00:09:25 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-02 20:02:42 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -102 +102 @@
     int currentId = psMemGetId();
     int ref = 0;
-    psMemProblemCallback cb;
 
     psLogMsg(__func__,PS_LOG_INFO,"memory reference count shall be incrementable/decrementable");
@@ -133 +132 @@
     }
 
-    psLogMsg(__func__,PS_LOG_INFO,"expect error from free as multiple referenced buffer is freed.");
-
-    problemCallbackCalled = 0;
-    cb = psMemProblemCallbackSet(memProblemCallback);
+    psLogMsg(__func__,PS_LOG_INFO,"psFree shall be just decrement a multiple refererenced pointer.");
 
     psFree(mem);
 
-    psMemProblemCallbackSet(cb);
-
-    if (problemCallbackCalled != 1) {
-        psError(__func__,"Expected memProblemCallback to be called once, but was called %d times.",
-                problemCallbackCalled);
+    ref = psMemGetRefCounter(mem);
+    if (ref != 1) {
+        psError(__func__,"Expected to find buffer reference count to be 1, but it was %d.",ref);
         return 1;
     }

trunk/psLib/test/sysUtils/verified/tst_psMemory.stderr

@@ -17 +17 @@
  <DATE> <TIME> <HOST> |I|TPOutOfMemory  |Upon requesting more memory than is available, psalloc shall call the psMemExhaustedCallback.
  <DATE> <TIME> <HOST> |I|TPOutOfMemoryExhaustedCallback|Custom MemExhaustedCallback was invoked.
- <DATE> <TIME> <HOST> |A|p_psAlloc      |Failed to allocate 1073741823 bytes at tst_psMemory.c:178
+ <DATE> <TIME> <HOST> |A|p_psAlloc      |Failed to allocate 4611686018427387903 bytes at tst_psMemory.c:170
 
 ---> TESTPOINT PASSED (psMemory{450-TPOutOfMemory} | tst_psMemory.c)
@@ -59 +59 @@
  <DATE> <TIME> <HOST> |I|TPcheckLeaks   |following psMemCheckLeaks call should produce one instance.
                    file:line ID
-         tst_psMemory.c:339  1
+         tst_psMemory.c:333  1
  <DATE> <TIME> <HOST> |I|TPcheckLeaks   |Testing psMemCheckLeaks again with a different leak location
  <DATE> <TIME> <HOST> |I|TPcheckLeaks   |following psMemCheckLeaks call should produce one error.
                    file:line ID
-         tst_psMemory.c:369  11
+         tst_psMemory.c:363  11
  <DATE> <TIME> <HOST> |I|TPcheckLeaks   |Testing psMemCheckLeaks again with multiple leak locations.
  <DATE> <TIME> <HOST> |I|TPcheckLeaks   |following psMemCheckLeaks call should produce two errors.
                    file:line ID
-         tst_psMemory.c:397  16
-         tst_psMemory.c:397  14
+         tst_psMemory.c:391  16
+         tst_psMemory.c:391  14
 
 ---> TESTPOINT PASSED (psMemory{454-TPcheckLeaks} | tst_psMemory.c)
@@ -80 +80 @@
  <DATE> <TIME> <HOST> |I|TPmemCorruption|psMemCheckCorruption shall detect memory corruptions
  <DATE> <TIME> <HOST> |I|TPmemCorruption|psMemCheckCorruption should output an error message and memProblemCallback callback should be called.
- <DATE> <TIME> <HOST> |E|psMemCheckCorruption|psMemCheckCorruption: memory block 1 is corrupted (buffer underflow 0xdeadbeef 0x2)
- <DATE> <TIME> <HOST> |I|memProblemCallback|memory callback called for id 1 (psMemCheckCorruption:226).
+ <DATE> <TIME> <HOST> |E|psMemCheckCorruption|psMemCheckCorruption: memory block 1 is corrupted (buffer underflow 0xdeadbeef 0x2deadbeef)
+ <DATE> <TIME> <HOST> |I|memProblemCallback|memory callback called for id 1 (psMemCheckCorruption:228).
 
 ---> TESTPOINT PASSED (psMemory{455-TPmemCorruption} | tst_psMemory.c)
@@ -92 +92 @@
 
  <DATE> <TIME> <HOST> |I|TPFreeReferencedMemory|memory reference count shall be incrementable/decrementable
- <DATE> <TIME> <HOST> |I|TPFreeReferencedMemory|expect error from free as multiple referenced buffer is freed.
- <DATE> <TIME> <HOST> |E|p_psFree       |The buffer being freed is referenced elsewhere. Buffer's reference count was decremented instead.
- <DATE> <TIME> <HOST> |I|memProblemCallback|memory callback called for id 1 (tst_psMemory.c:140).
+ <DATE> <TIME> <HOST> |I|TPFreeReferencedMemory|psFree shall be just decrement a multiple refererenced pointer.
 
 ---> TESTPOINT PASSED (psMemory{456-TPFreeReferencedMemory} | tst_psMemory.c)