Changeset 2024

Timestamp:

Oct 8, 2004, 12:58:53 PM (22 years ago)

Author:

harman

Message:

Added memory leak checks

Location:

trunk/psLib/test/astronomy

Files:

• tst_psTime_01.c (modified) (11 diffs)
• tst_psTime_02.c (modified) (2 diffs)

trunk/psLib/test/astronomy/tst_psTime_01.c

@@ -22 +22 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.9 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-09-11 01:12:42 $
+ *  @version $Revision: 1.10 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-08 22:58:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
 int main(int argc, char* argv[])
 {
-    psTime *time;
     psTime *testTime;
     char *testString = "2004-07-21T18:22:24.272Z";
-    time = (psTime*)psAlloc(sizeof(psTime));
 
     // Test time was taken at July 21, 2004 at 18:22:24.272044
@@ -48 +46 @@
     // Test A - Get current TAI time
     printPositiveTestHeader(stdout,"psTime", "Get current TAI time");
-    time = psTimeGetTime(PS_TIME_TAI);
+    psTime *timeA = NULL;
+    timeA = psTimeGetTime(PS_TIME_TAI);
+    psFree(timeA);
     printFooter(stdout, "psTime", "Get current TAI time", true);
 
@@ -72 +72 @@
     // Test D - Convert ISO time to psTime
     printPositiveTestHeader(stdout,"psTime", "Convert ISO time to psTime");
-    time = psISOToTime(isoString);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)time->sec, (psU32)time->usec);
+    psTime *timeD = NULL;
+    timeD = psISOToTime(isoString);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeD->sec, (psU32)timeD->usec);
     psFree(isoString);
+    psFree(timeD);
     printFooter(stdout, "psTime", "Convert ISO time to psTime", true);
 
@@ -80 +82 @@
     // Test E - Convert TAI to UTC time
     printPositiveTestHeader(stdout,"psTime", "Convert psTime time to UTC time");
-    time = psTimeConvert(testTime, PS_TIME_UTC);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)time->sec, (psU32)time->usec);
+    psTime *timeE = NULL;
+    timeE = (psTime*)psAlloc(sizeof(psTime));
+    timeE->sec = 1090434144;
+    timeE->usec = 272044;
+    timeE->type = PS_TIME_TAI;
+    timeE = psTimeConvert(timeE, PS_TIME_UTC);
+    psFree(timeE);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeE->sec, (psU32)timeE->usec);
     printFooter(stdout, "psTime", "Convert psTime time to UTC time", true);
 
@@ -87 +95 @@
     // Test F - Convert UTC time to psTime
     printPositiveTestHeader(stdout,"psTime", "Convert UTC time to psTime");
-    time->type = PS_TIME_UTC;
-    time = psTimeConvert(time, PS_TIME_TAI);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)time->sec, (psU32)time->usec);
+    psTime *timeF = NULL;
+    timeF = (psTime*)psAlloc(sizeof(psTime));
+    timeF->sec = 1090434112;
+    timeF->usec = 272044;
+    timeF->type = PS_TIME_UTC;
+    timeF = psTimeConvert(timeF, PS_TIME_TAI);
+    psFree(timeF);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeF->sec, (psU32)timeF->usec);
     printFooter(stdout, "psTime", "Convert UTC time to psTime", true);
 
@@ -103 +116 @@
     // Test H - Convert MJD time to psTime
     printPositiveTestHeader(stdout,"psTime", "Convert MJD time to psTime");
-    time = psMJDToTime(mjdTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)time->sec, (psU32)time->usec);
+    psTime *timeH = NULL;
+    timeH = psMJDToTime(mjdTime);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeH->sec, (psU32)timeH->usec);
+    psFree(timeH);
     printFooter(stdout, "psTime", "Convert MJD time to psTime", true);
 
@@ -118 +133 @@
     // Test J - Convert JD time to psTime
     printPositiveTestHeader(stdout,"psTime", "Convert JD time to psTime");
-    time = psJDToTime(jdTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)time->sec, (psU32)time->usec);
+    psTime *timeJ = NULL;
+    timeJ = psJDToTime(jdTime);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeJ->sec, (psU32)timeJ->usec);
+    psFree(timeJ);
     printFooter(stdout, "psTime", "Convert JD time to psTime", true);
 
@@ -133 +150 @@
     // Test L - Convert timeval time to psTime
     printPositiveTestHeader(stdout,"psTime", "Convert timeval time to psTime");
-    time = psTimevalToTime(&timevalTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)time->sec, (psU32)time->usec);
+    psTime *timeL = NULL;
+    timeL = psTimevalToTime(&timevalTime);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeL->sec, (psU32)timeL->usec);
+    psFree(timeL);
     printFooter(stdout, "psTime", "Convert timeval time to psTime", true);
 
@@ -154 +173 @@
     // Test N - Convert tm time to psTime
     printPositiveTestHeader(stdout, "psTime", "Convert tm time to psTime");
-    time = psTMToTime(tmTime);
-    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)time->sec, (psU32)time->usec);
+    psTime *timeN = NULL;
+    timeN = psTMToTime(tmTime);
+    printf("psTime: Seconds = %ld Microseconds = %d\n", (long)timeN->sec, (psU32)timeN->usec);
+    psFree(timeN);
+    psFree(tmTime);
     printFooter(stdout, "psTime", "Convert tm time to psTime", true);
 
@@ -166 +188 @@
     double dblTime = psTimeToLST(testTime2, 1);
     printf("LST (rad): %lf\n", dblTime);
+    psFree(testTime2);
     printFooter(stdout, "psTime", "Convert psTime time to LST", true);
 
+
+    // Test P - Free psMetadata
+    printPositiveTestHeader(stdout, "psMetadata", "Test P - Free psMetadata");
+    psFree(testTime);
+    psMemCheckLeaks(0, NULL, stdout);
+    psMemCheckCorruption(0);
+    int nBad = psMemCheckCorruption(0);
+    if(nBad) {
+        printf("ERROR: Found %d bad memory blocks\n", nBad);
+    }
+    printFooter(stdout, "psMetadata", "Test P - Free psMetadata", true);
 
     return 0;

trunk/psLib/test/astronomy/tst_psTime_02.c

@@ -9 +9 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.3 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-25 01:38:48 $
+ *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-08 22:58:47 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -39 +39 @@
     printFooter(stdout, "psTime", "Attempt to use null timeval", true);
 
+
+    // Test C - Free psMetadata
+    printPositiveTestHeader(stdout, "psMetadata", "Test C - Free psMetadata");
+    psMemCheckLeaks(0, NULL, stdout);
+    psMemCheckCorruption(0);
+    int nBad = psMemCheckCorruption(0);
+    if(nBad) {
+        printf("ERROR: Found %d bad memory blocks\n", nBad);
+    }
+    printFooter(stdout, "psMetadata", "Test C - Free psMetadata", true);
     return 0;
 }