Index: /trunk/psLib/test/astronomy/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psMetadataIO.c (revision 2392) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:31 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:53:39 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -174,5 +174,8 @@ psFree(metadata2); psFree(metadata3); - psMemCheckLeaks(0, NULL, stdout); + if(psMemCheckLeaks(0, NULL, stdout,false)) { + psError(PS_ERR_UNKNOWN,true,"Memory leak detected"); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/astronomy/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psMetadata_01.c (revision 2392) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -260,5 +260,8 @@ psFree(metadata2); psFree(metadata3); - psMemCheckLeaks(0, NULL, stdout); + if(psMemCheckLeaks(0, NULL, stdout,false)) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/astronomy/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psMetadata_02.c (revision 2392) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -134,5 +134,8 @@ psFree(badItem); psFree(metadata); - psMemCheckLeaks(0, NULL, stdout); + if(psMemCheckLeaks(0, NULL, stdout,false) ) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/astronomy/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psMetadata_03.c (revision 2392) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -226,5 +226,5 @@ psFree(errItem); psFree(errMetadata); - if( psMemCheckLeaks(0, NULL, stdout) != 0 ) { + if( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) { psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 25; Index: /trunk/psLib/test/astronomy/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psMetadata_04.c (revision 2392) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -196,5 +196,5 @@ psFree(item3); psFree(item4); - if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { + if ( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) { psError(PS_ERR_UNKNOWN, true,"memory leaks detected."); return 20; Index: /trunk/psLib/test/astronomy/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psMetadata_05.c (revision 2392) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -266,5 +266,5 @@ psFree(item7); psFree(item8); - if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { + if ( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 50; Index: /trunk/psLib/test/astronomy/tst_psMetadata_06.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psMetadata_06.c (revision 2392) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -129,5 +129,5 @@ psFree(item2b); psFree(metadata); - if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { + if ( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 25; Index: /trunk/psLib/test/astronomy/tst_psTime_01.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psTime_01.c (revision 2392) @@ -23,6 +23,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-10 22:39:18 $ + * @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 20:52:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -197,5 +197,8 @@ psFree(testTime); psLibFinalize(); - psMemCheckLeaks(0, NULL, stdout); + if( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected"); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/astronomy/tst_psTime_02.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psTime_02.c (revision 2392) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 20:52:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -42,5 +42,8 @@ // Test C - Free data printPositiveTestHeader(stdout, "psTime", "Test C - Free data"); - psMemCheckLeaks(0, NULL, stdout); + if ( psMemCheckLeaks(0, NULL, stdout,false) != 0) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected"); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/astronomy/tst_psTime_03.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psTime_03.c (revision 2392) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-10 23:08:10 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 20:52:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -133,5 +133,8 @@ psFree(time5b); psFree(timeOut5); - psMemCheckLeaks(0, NULL, stdout); + if ( psMemCheckLeaks(0, NULL, stdout,false) ) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/astronomy/tst_psTime_04.c =================================================================== --- /trunk/psLib/test/astronomy/tst_psTime_04.c (revision 2391) +++ /trunk/psLib/test/astronomy/tst_psTime_04.c (revision 2392) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-15 20:14:44 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 20:52:45 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -77,5 +77,8 @@ printPositiveTestHeader(stdout, "psTime", "Test G - Free data"); psTimeFinalize(); - psMemCheckLeaks(0, NULL, stdout); + if( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) { + psError(PS_ERR_UNKNOWN,true,"Memory leak detected."); + return 10; + } psMemCheckCorruption(0); int nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/collections/tst_psArray.c =================================================================== --- /trunk/psLib/test/collections/tst_psArray.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psArray.c (revision 2392) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-19 01:04:51 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:07:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -119,5 +119,4 @@ printFooter(stdout, "psArray", "Reallocate void pointer array bigger", true); - // Test D - Reallocate void pointer array smaller printPositiveTestHeader(stdout,"psArray","Reallocate void pointer array smaller"); @@ -206,5 +205,5 @@ psFree(mySt[i]); } - if( psMemCheckLeaks(0, NULL, stdout) != 0) { + if( psMemCheckLeaks(0, NULL, stdout, false) != 0) { psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); return 110; Index: /trunk/psLib/test/collections/tst_psHash00.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash00.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psHash00.c (revision 2392) @@ -55,5 +55,5 @@ psFree(myHashTable); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/collections/tst_psHash01.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash01.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psHash01.c (revision 2392) @@ -70,5 +70,5 @@ testStatus); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/collections/tst_psHash02.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash02.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psHash02.c (revision 2392) @@ -80,5 +80,5 @@ psFree(myHashTable); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/collections/tst_psHash03.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash03.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psHash03.c (revision 2392) @@ -29,7 +29,7 @@ psS32 numBlocks = 0; - numBlocks = psMemCheckLeaks(currentId, &memBlocks, NULL); + numBlocks = psMemCheckLeaks(currentId, &memBlocks, NULL,false); printf("******************** %s ********************\n", myString); - printf("%d mem blocks\n", psMemCheckLeaks(currentId,NULL,stderr)); + printf("%d mem blocks\n", psMemCheckLeaks(currentId,NULL,stderr,false)); printf("%d blocks\n", numBlocks); printf("* "); @@ -129,5 +129,5 @@ psFree(ids[i]); } - memLeaks = psMemCheckLeaks(currentId,NULL,stdout); + memLeaks = psMemCheckLeaks(currentId,NULL,stdout,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/collections/tst_psHash04.c =================================================================== --- /trunk/psLib/test/collections/tst_psHash04.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psHash04.c (revision 2392) @@ -75,5 +75,5 @@ psFree(myHashTable); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/collections/tst_psMetadataIO.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadataIO.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psMetadataIO.c (revision 2392) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:31 $ +* @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:53:39 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -174,5 +174,8 @@ psFree(metadata2); psFree(metadata3); - psMemCheckLeaks(0, NULL, stdout); + if(psMemCheckLeaks(0, NULL, stdout,false)) { + psError(PS_ERR_UNKNOWN,true,"Memory leak detected"); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/collections/tst_psMetadata_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psMetadata_01.c (revision 2392) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.14 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.15 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -260,5 +260,8 @@ psFree(metadata2); psFree(metadata3); - psMemCheckLeaks(0, NULL, stdout); + if(psMemCheckLeaks(0, NULL, stdout,false)) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/collections/tst_psMetadata_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_02.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psMetadata_02.c (revision 2392) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -134,5 +134,8 @@ psFree(badItem); psFree(metadata); - psMemCheckLeaks(0, NULL, stdout); + if(psMemCheckLeaks(0, NULL, stdout,false) ) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); + return 10; + } psMemCheckCorruption(0); psS32 nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/collections/tst_psMetadata_03.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_03.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psMetadata_03.c (revision 2392) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -226,5 +226,5 @@ psFree(errItem); psFree(errMetadata); - if( psMemCheckLeaks(0, NULL, stdout) != 0 ) { + if( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) { psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 25; Index: /trunk/psLib/test/collections/tst_psMetadata_04.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_04.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psMetadata_04.c (revision 2392) @@ -18,6 +18,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -196,5 +196,5 @@ psFree(item3); psFree(item4); - if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { + if ( psMemCheckLeaks(0, NULL, stdout,false) != 0 ) { psError(PS_ERR_UNKNOWN, true,"memory leaks detected."); return 20; Index: /trunk/psLib/test/collections/tst_psMetadata_05.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_05.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psMetadata_05.c (revision 2392) @@ -22,6 +22,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -266,5 +266,5 @@ psFree(item7); psFree(item8); - if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { + if ( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 50; Index: /trunk/psLib/test/collections/tst_psMetadata_06.c =================================================================== --- /trunk/psLib/test/collections/tst_psMetadata_06.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psMetadata_06.c (revision 2392) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-04 01:05:00 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 20:54:50 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -129,5 +129,5 @@ psFree(item2b); psFree(metadata); - if ( psMemCheckLeaks(0, NULL, stdout) != 0 ) { + if ( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); return 25; Index: /trunk/psLib/test/collections/tst_psVector.c =================================================================== --- /trunk/psLib/test/collections/tst_psVector.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psVector.c (revision 2392) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:07:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -78,5 +78,5 @@ printPositiveTestHeader(stdout, "psVector", "Free S32 vector"); psFree(psVec); - psS32 leaks = psMemCheckLeaks(0, NULL, stdout); + psS32 leaks = psMemCheckLeaks(0, NULL, stdout, false); if(leaks != 0) { printf("ERROR: Found %d memory leaks\n",leaks); Index: /trunk/psLib/test/collections/tst_psVectorSort_01.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psVectorSort_01.c (revision 2392) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:07:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -73,5 +73,8 @@ psFree(in); psFree(out); - psMemCheckLeaks(0, NULL, stdout); + if ( psMemCheckLeaks(0, NULL, stdout, false)) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); + return 10; + } psS32 nBad = psMemCheckCorruption(0); if(nBad) { Index: /trunk/psLib/test/collections/tst_psVectorSort_02.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_02.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psVectorSort_02.c (revision 2392) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.4 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:07:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -61,5 +61,5 @@ psFree(in); psFree(out); - psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout); + psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout, false); if(nLeaks) { printf("ERROR: Found %d memory leaks\n", nLeaks); Index: /trunk/psLib/test/collections/tst_psVectorSort_03.c =================================================================== --- /trunk/psLib/test/collections/tst_psVectorSort_03.c (revision 2391) +++ /trunk/psLib/test/collections/tst_psVectorSort_03.c (revision 2392) @@ -12,6 +12,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:07:42 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -72,5 +72,5 @@ psFree(out); psFree(out2); - psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout); + psS32 nLeaks = psMemCheckLeaks(0, NULL, stdout, false); if(nLeaks) { printf("ERROR: Found %d memory leaks\n", nLeaks); Index: /trunk/psLib/test/dataIO/tst_psLookupTable_01.c =================================================================== --- /trunk/psLib/test/dataIO/tst_psLookupTable_01.c (revision 2391) +++ /trunk/psLib/test/dataIO/tst_psLookupTable_01.c (revision 2392) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-09 01:23:57 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 21:10:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,5 +46,8 @@ printPositiveTestHeader(stdout, "psMetadata", "Test J - Free psMetadata"); psFree(table1); - psMemCheckLeaks(0, NULL, stdout); + if ( psMemCheckLeaks(0, NULL, stdout, false) ) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected"); + return 10; + } psMemCheckCorruption(0); int nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/dataManip/tst_psFunc00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc00.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psFunc00.c (revision 2392) @@ -60,5 +60,5 @@ psFree(my1DPoly); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -90,5 +90,5 @@ psFree(my2DPoly); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -121,5 +121,5 @@ psFree(my3DPoly); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -155,5 +155,5 @@ psFree(my4DPoly); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -185,5 +185,5 @@ psFree(my1DPolyD); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -211,5 +211,5 @@ psFree(my2DPolyD); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -242,5 +242,5 @@ psFree(my3DPolyD); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -276,5 +276,5 @@ psFree(my4DPolyD); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -306,5 +306,5 @@ psFree(my1DPoly); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -335,5 +335,5 @@ psFree(my2DPoly); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -366,5 +366,5 @@ psFree(my3DPoly); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -400,5 +400,5 @@ psFree(my4DPoly); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -430,5 +430,5 @@ psFree(my1DPolyD); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -456,5 +456,5 @@ psFree(my2DPolyD); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -487,5 +487,5 @@ psFree(my3DPolyD); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -521,5 +521,5 @@ psFree(my4DPolyD); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psFunc01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc01.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psFunc01.c (revision 2392) @@ -36,5 +36,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -63,5 +63,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psFunc02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psFunc02.c (revision 2392) @@ -66,5 +66,5 @@ psFree(tmpSpline); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -92,5 +92,5 @@ psFree(tmpSpline); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -146,5 +146,5 @@ psFree(tmpSpline); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -200,5 +200,5 @@ psFree(tmpSpline); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -226,5 +226,5 @@ psFree(tmpSpline); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -280,5 +280,5 @@ psFree(tmpSpline); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psFunc03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc03.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psFunc03.c (revision 2392) @@ -75,5 +75,5 @@ psFree(bounds); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -135,5 +135,5 @@ psFree(bounds); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psFunc04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc04.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psFunc04.c (revision 2392) @@ -56,5 +56,5 @@ psMemCheckCorruption(1); psFree(data); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -108,5 +108,5 @@ psMemCheckCorruption(1); psFree(data); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psFunc05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc05.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psFunc05.c (revision 2392) @@ -66,5 +66,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psFunc07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psFunc07.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psFunc07.c (revision 2392) @@ -87,5 +87,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -156,5 +156,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psHist00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist00.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psHist00.c (revision 2392) @@ -110,5 +110,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psHist01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist01.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psHist01.c (revision 2392) @@ -100,5 +100,5 @@ "Deallocate the psHistogram structure."); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psHist02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist02.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psHist02.c (revision 2392) @@ -174,5 +174,5 @@ psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if ( 0 != memLeaks ) { psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); Index: /trunk/psLib/test/dataManip/tst_psHist03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psHist03.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psHist03.c (revision 2392) @@ -114,5 +114,5 @@ "Deallocate the psHistogram structure."); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,NULL); + memLeaks = psMemCheckLeaks(currentId,NULL,NULL,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psMatrix01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMatrix01.c (revision 2392) @@ -11,6 +11,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 21:00:21 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -79,5 +79,5 @@ psFree( outImage ); psFree( outImageNull ); - psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout ); + psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout, false ); if ( nLeaks != 0 ) { printf( "ERROR: Found %d memory leaks\n", nLeaks ); Index: /trunk/psLib/test/dataManip/tst_psMatrix03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMatrix03.c (revision 2392) @@ -14,6 +14,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.10 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:00:21 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -111,5 +111,8 @@ psFree(outVector); psFree(inVector); - psMemCheckLeaks(0, NULL, stdout); + if( psMemCheckLeaks(0, NULL, stdout, false) ) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected"); + return 10; + } psS32 nBad = psMemCheckCorruption(0); if(nBad) { Index: /trunk/psLib/test/dataManip/tst_psMatrix04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMatrix04.c (revision 2392) @@ -13,6 +13,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:00:21 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -86,5 +86,8 @@ psFree(inImage); psFree(det2); - psMemCheckLeaks(0, NULL, stdout); + if(psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); + return 10; + } psS32 nBad = psMemCheckCorruption(0); if(nBad) { Index: /trunk/psLib/test/dataManip/tst_psMatrix05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMatrix05.c (revision 2392) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 21:00:21 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -68,5 +68,5 @@ psFree( inImage1 ); psFree( inImage2 ); - psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout ); + psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout, false ); if ( nLeaks != 0 ) { printf( "ERROR: Found %d memory leaks\n", nLeaks ); Index: /trunk/psLib/test/dataManip/tst_psMatrix06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMatrix06.c (revision 2392) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-10-27 00:57:33 $ +* @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 21:00:21 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -76,5 +76,5 @@ psFree( outImage ); psFree( inImage ); - psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout ); + psS32 nLeaks = psMemCheckLeaks( 0, NULL, stdout, false ); if ( nLeaks != 0 ) { printf( "ERROR: Found %d memory leaks\n", nLeaks ); Index: /trunk/psLib/test/dataManip/tst_psMatrix07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMatrix07.c (revision 2392) @@ -16,6 +16,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.7 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:00:21 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -168,5 +168,8 @@ psFree(m4); psFree(badImage); - psMemCheckLeaks(0, NULL, stdout); + if( psMemCheckLeaks(0, NULL, stdout, false) != 0) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); + return 10; + } psS32 nBad = psMemCheckCorruption(0); if(nBad) { Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c (revision 2392) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.5 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-10-27 00:57:33 $ + * @version $Revision: 1.6 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:02:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -76,7 +76,10 @@ -#define CHECK_MEMORY \ -psMemCheckLeaks(0, NULL, stdout); \ -psS32 nBad = psMemCheckCorruption(0); \ +#define CHECK_MEMORY \ +if(psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { \ + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected."); \ + return 10; \ +} \ +psS32 nBad = psMemCheckCorruption(0); \ if(nBad) { \ printf("ERROR: Found %d bad memory blocks\n", nBad); \ Index: /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (revision 2392) @@ -10,6 +10,6 @@ * @author Ross Harman, MHPCC * - * @version $Revision: 1.8 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-11-04 01:05:00 $ + * @version $Revision: 1.9 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-11-22 21:02:51 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -82,5 +82,5 @@ #define CHECK_MEMORY \ -if( psMemCheckLeaks(0, NULL, stdout) != 0 ) { \ +if( psMemCheckLeaks(0, NULL, stdout, false) != 0 ) { \ psError(PS_ERR_UNKNOWN, true,"Memory leaks detected."); \ return 50; \ Index: /trunk/psLib/test/dataManip/tst_psMinimize04.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMinimize04.c (revision 2392) @@ -88,5 +88,5 @@ psFree(yErr); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -151,5 +151,5 @@ psFree(y); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -210,5 +210,5 @@ psFree(y); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -243,5 +243,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMinimize04_F32.c (revision 2392) @@ -87,5 +87,5 @@ psFree(yErr); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -150,5 +150,5 @@ psFree(y); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -209,5 +209,5 @@ psFree(y); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -237,5 +237,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psMinimize04b.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04b.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMinimize04b.c (revision 2392) @@ -82,5 +82,5 @@ psFree(yErr); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -142,5 +142,5 @@ psFree(y); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -202,5 +202,5 @@ psFree(y); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -233,5 +233,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMinimize04b_F32.c (revision 2392) @@ -82,5 +82,5 @@ psFree(yErr); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -142,5 +142,5 @@ psFree(y); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -202,5 +202,5 @@ psFree(y); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -233,5 +233,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psMinimize05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize05.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMinimize05.c (revision 2392) @@ -124,5 +124,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -195,5 +195,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -256,5 +256,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psMinimize06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psMinimize06.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psMinimize06.c (revision 2392) @@ -108,5 +108,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,NULL); + memLeaks = psMemCheckLeaks(currentId,NULL,NULL,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psStats00.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats00.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats00.c (revision 2392) @@ -192,5 +192,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psStats01.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats01.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats01.c (revision 2392) @@ -112,5 +112,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psStats02.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats02.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats02.c (revision 2392) @@ -112,5 +112,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psStats03.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats03.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats03.c (revision 2392) @@ -107,5 +107,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psStats05.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats05.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats05.c (revision 2392) @@ -61,5 +61,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psStats06.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats06.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats06.c (revision 2392) @@ -115,5 +115,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psStats07.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats07.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats07.c (revision 2392) @@ -243,5 +243,5 @@ psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if ( 0 != memLeaks ) { psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); @@ -478,5 +478,5 @@ psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if ( 0 != memLeaks ) { psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); Index: /trunk/psLib/test/dataManip/tst_psStats08.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats08.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats08.c (revision 2392) @@ -159,5 +159,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/dataManip/tst_psStats09.c =================================================================== --- /trunk/psLib/test/dataManip/tst_psStats09.c (revision 2391) +++ /trunk/psLib/test/dataManip/tst_psStats09.c (revision 2392) @@ -133,5 +133,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/fileUtils/tst_psLookupTable_01.c =================================================================== --- /trunk/psLib/test/fileUtils/tst_psLookupTable_01.c (revision 2391) +++ /trunk/psLib/test/fileUtils/tst_psLookupTable_01.c (revision 2392) @@ -17,6 +17,6 @@ * @author Ross Harman, MHPCC * -* @version $Revision: 1.2 $ $Name: not supported by cvs2svn $ -* @date $Date: 2004-11-09 01:23:57 $ +* @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ +* @date $Date: 2004-11-22 21:10:52 $ * * Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -46,5 +46,8 @@ printPositiveTestHeader(stdout, "psMetadata", "Test J - Free psMetadata"); psFree(table1); - psMemCheckLeaks(0, NULL, stdout); + if ( psMemCheckLeaks(0, NULL, stdout, false) ) { + psError(PS_ERR_UNKNOWN,true,"Memory leaks detected"); + return 10; + } psMemCheckCorruption(0); int nBad = psMemCheckCorruption(0); Index: /trunk/psLib/test/image/tst_psImageStats00.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats00.c (revision 2391) +++ /trunk/psLib/test/image/tst_psImageStats00.c (revision 2392) @@ -138,5 +138,5 @@ psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if ( 0 != memLeaks ) { psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); @@ -190,5 +190,5 @@ psFree( tmpImage ); psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if ( 0 != memLeaks ) { psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); Index: /trunk/psLib/test/image/tst_psImageStats01.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats01.c (revision 2391) +++ /trunk/psLib/test/image/tst_psImageStats01.c (revision 2392) @@ -132,5 +132,5 @@ psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if ( 0 != memLeaks ) { psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); @@ -171,5 +171,5 @@ psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if ( 0 != memLeaks ) { psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); @@ -187,5 +187,5 @@ psFree(myStats); psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if( memLeaks != 0 ) { psAbort(__func__, "Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/image/tst_psImageStats02.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats02.c (revision 2391) +++ /trunk/psLib/test/image/tst_psImageStats02.c (revision 2392) @@ -133,5 +133,5 @@ psMemCheckCorruption( 1 ); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if ( 0 != memLeaks ) { psAbort( __func__, "Memory Leaks! (%d leaks)", memLeaks ); Index: /trunk/psLib/test/image/tst_psImageStats03.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats03.c (revision 2391) +++ /trunk/psLib/test/image/tst_psImageStats03.c (revision 2392) @@ -84,5 +84,5 @@ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/image/tst_psImageStats04.c =================================================================== --- /trunk/psLib/test/image/tst_psImageStats04.c (revision 2391) +++ /trunk/psLib/test/image/tst_psImageStats04.c (revision 2392) @@ -92,5 +92,5 @@ /*************************************************************************/ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); @@ -163,5 +163,5 @@ /*************************************************************************/ psMemCheckCorruption(1); - memLeaks = psMemCheckLeaks(currentId,NULL,stderr); + memLeaks = psMemCheckLeaks(currentId,NULL,stderr,false); if (0 != memLeaks) { psAbort(__func__,"Memory Leaks! (%d leaks)", memLeaks); Index: /trunk/psLib/test/psTest.c =================================================================== --- /trunk/psLib/test/psTest.c (revision 2391) +++ /trunk/psLib/test/psTest.c (revision 2392) @@ -151,5 +151,5 @@ psS32 retVal = fcn(); if ( retVal == 0 ) { // only bother checking memory if test executed to end. - if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) { + if ( psMemCheckLeaks( currentId, NULL, stderr, false ) != 0 ) { psError(PS_ERR_UNKNOWN, true, "Memory Leaks Detected" ); retVal = 64; @@ -175,5 +175,5 @@ childReturn = fcn(); if ( childReturn == 0 ) { // only bother checking memory if test executed to end. - if ( psMemCheckLeaks( currentId, NULL, stderr ) != 0 ) { + if ( psMemCheckLeaks( currentId, NULL, stderr, false ) != 0 ) { psError(PS_ERR_UNKNOWN, true, "Memory Leaks Detected" ); childReturn = 64;