Changeset 7608 for trunk/psLib/src/astro/psTime.c

Timestamp:

Jun 21, 2006, 7:46:06 AM (20 years ago)

Author:

rhl

Message:

1/ The p_psMemAllocatePersistent() block didn't cover enough of
the function
2/ If memory is already persistent, don't unset this (i.e. save initial
state)
3/ There's no need to make psError calls non-persistent. Persistent
memory can be freed (and in this case will be automatically by
psError(..., true, ...)); it just doesn't show up as a leak unless
you ask psMemCheckLeaks to show you leaked persistent memory

File:

• trunk/psLib/src/astro/psTime.c (modified) (16 diffs)

trunk/psLib/src/astro/psTime.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.85 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-06-13 23:56:11 $
+ *  @version $Revision: 1.86 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-06-21 17:46:06 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -267 +267 @@
     }
 
-    p_psMemAllocatePersistent(true);    // All memory allocated below is "persistent"
+    const bool initialPersistence =
+        p_psMemAllocatePersistent(true); // All memory allocated below is "persistent"
 
     // Read config file
@@ -280 +281 @@
     metadataItem = psMetadataLookup(timeMetadata, "psLib.time.tables.n");
     if(metadataItem == NULL) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                 "psLib.time.tables.n");
@@ -290 +291 @@
     metadataItem = psMetadataLookup(timeMetadata, "psLib.time.tables.from");
     if(metadataItem == NULL) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                 "psLib.time.tables.from");
@@ -297 +298 @@
     tablesFrom = psVectorCopy(tablesFrom, metadataItem->data.V, PS_TYPE_F64);
     if(tablesFrom->n != numTables) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_VECTOR, tablesFrom->n, numTables);
         psFree(tablesFrom);
@@ -306 +307 @@
     metadataItem = psMetadataLookup(timeMetadata, "psLib.time.tables.to");
     if(metadataItem == NULL) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                 "psLib.time.tables.to");
@@ -313 +314 @@
     }
     tablesTo = psVectorCopy(tablesTo, metadataItem->data.V, PS_TYPE_F64);
-    p_psMemAllocatePersistent(false);   // Turn off persistency
     if(tablesTo->n != numTables) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_VECTOR, tablesTo->n, numTables);
         psFree(tablesFrom);
@@ -325 +325 @@
     metadataItem = psMetadataLookup(timeMetadata, "psLib.time.tables.index");
     if(metadataItem == NULL) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                 "psLib.time.tables.index");
@@ -334 +334 @@
     tablesIndex = psVectorCopy(tablesIndex, metadataItem->data.V, PS_TYPE_S32);
     if(tablesIndex->n != numTables) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_BAD_VECTOR,tablesIndex->n,numTables);
         psFree(tablesFrom);
@@ -345 +345 @@
     metadataItem = psMetadataLookup(timeMetadata, "psLib.time.tables.dir");
     if(metadataItem == NULL) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                 "psLib.time.tables.dir");
@@ -358 +358 @@
     metadataItem = psMetadataLookup(timeMetadata, "psLib.time.tables.files");
     if(metadataItem == NULL) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                 "psLib.time.tables.files");
@@ -373 +373 @@
     metadataItem = psMetadataLookup(timeMetadata, "psLib.time.tables.format");
     if(metadataItem == NULL) {
-        p_psMemAllocatePersistent(false);
+        p_psMemAllocatePersistent(initialPersistence);
         psError(PS_ERR_BAD_PARAMETER_VALUE,true, PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                 "psLib.time.tables.format");
@@ -403 +403 @@
         tableFormat = getToken(&formatPtr,",",&status);
         if(tableFormat == NULL) {
-            p_psMemAllocatePersistent(false);
             psError(PS_ERR_BAD_PARAMETER_VALUE,true,PS_ERRORTEXT_psTime_LOOKUP_METADATA_FAILED,
                     "psLib.time.tables.format");
-            p_psMemAllocatePersistent(true);
         }
 
@@ -414 +412 @@
             numLines = psLookupTableRead(table);
         } else {
-            p_psMemAllocatePersistent(false);
             psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, i+1, numTables);
-            p_psMemAllocatePersistent(true);
         }
 
@@ -428 +424 @@
                 foundTable = true;
             } else if(foundTable==false && j==numTables-1) {
-                p_psMemAllocatePersistent(false);
                 psError(PS_ERR_BAD_PARAMETER_VALUE, true, PS_ERRORTEXT_psTime_BAD_TABLE_COUNT, j, numTables);
-                p_psMemAllocatePersistent(true);
             }
         }
@@ -441 +435 @@
     }
 
-    p_psMemAllocatePersistent(false);
+    p_psMemAllocatePersistent(initialPersistence);
 
     if(numTables != i) {