Changeset 32339

Timestamp:

Sep 6, 2011, 11:02:30 AM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20110710/psLib/src

Files:

• fits/Makefile.am (modified) (2 diffs)
• fits/psFitsTableNew.c (copied) (copied from trunk/psLib/src/fits/psFitsTableNew.c )
• fits/psFitsTableNew.h (copied) (copied from trunk/psLib/src/fits/psFitsTableNew.h )
• pslib_strict.h (modified) (1 diff)
• sys/psMemory.c (modified) (5 diffs)
• sys/psMemory.h (modified) (2 diffs)
• types/psMetadataConfig.c (modified) (5 diffs)
• types/psMetadataConfig.h (modified) (1 diff)

branches/eam_branches/ipp-20110710/psLib/src/fits/Makefile.am

@@ -9 +9 @@
         psFitsImage.c \
         psFitsTable.c \
+        psFitsTableNew.c \
         psFitsFloat.c \
         psFitsFloatFile.c \
@@ -20 +21 @@
         psFitsImage.h \
         psFitsTable.h \
+        psFitsTableNew.h \
         psFitsFloat.h \
         psFitsFloatFile.h \

branches/eam_branches/ipp-20110710/psLib/src/pslib_strict.h

@@ -41 +41 @@
 #include "psFitsImage.h"
 #include "psFitsTable.h"
+#include "psFitsTableNew.h"
 #include "psFitsFloat.h"
 #include "psFitsFloatFile.h"

branches/eam_branches/ipp-20110710/psLib/src/sys/psMemory.c

@@ -515 +515 @@
             continue;
         }
-        if (memBlock->nextBlock && memBlock->nextBlock->inFlight) {
-            // nope, we need to try again
-            MUTEX_UNLOCK(&memBlockListMutex);
-            usleep (BLOCK_SLEEP);
-            retryLock ++;
-            continue;
-        }
-        if (memBlock->previousBlock && memBlock->previousBlock->inFlight) {
-            // nope, we need to try again
-            MUTEX_UNLOCK(&memBlockListMutex);
-            usleep (BLOCK_SLEEP);
-            retryLock ++;
-            continue;
-        }
+        if (memBlock->nextBlock && memBlock->nextBlock->inFlight) {
+            // we reply on the value of 'inFlight'.  we should crash if this block is corrupted
+            if (memBlock->nextBlock->startblock != P_PS_MEMMAGIC) {
+                PS_MEM_ABORT(__func__, "Unsafe to Continue\n");
+            }
+            if (memBlock->nextBlock->endblock != P_PS_MEMMAGIC) {
+                PS_MEM_ABORT(__func__, "Unsafe to Continue\n");
+            }
+            // nope, we need to try again
+            MUTEX_UNLOCK(&memBlockListMutex);
+            usleep (BLOCK_SLEEP);
+            retryLock ++;
+            continue;
+        }
+        if (memBlock->previousBlock && memBlock->previousBlock->inFlight) {
+            // we reply on the value of 'inFlight'.  we should crash if this block is corrupted
+            if (memBlock->previousBlock->startblock != P_PS_MEMMAGIC) {
+                PS_MEM_ABORT(__func__, "Unsafe to Continue\n");
+            }
+            if (memBlock->previousBlock->endblock != P_PS_MEMMAGIC) {
+                PS_MEM_ABORT(__func__, "Unsafe to Continue\n");
+            }
+            // nope, we need to try again
+            MUTEX_UNLOCK(&memBlockListMutex);
+            usleep (BLOCK_SLEEP);
+            retryLock ++;
+            continue;
+        }
 
         // the markers are ours!
@@ -889 +903 @@
                       psMemBlock ***array,
                       FILE * fd,
-                      bool persistence)
+                      bool persistence,
+                      int maxDisplayedLeaksCount          ///< List at most maxDisplayedLeaksCount (-1 for all)
+                  )
 {
     psS32 nleak = 0;
@@ -896 +912 @@
 
     // XXX move this elsewhere?
-    fprintf (stderr, "set %d locks, cleared %d locks, retry on %d locks (memID %ld)\n", setLock, clearLock, retryLock, memid);
+    if (fd != NULL) {
+      fprintf (fd, "set %d locks, cleared %d locks, retry on %d locks (memID %ld)\n", setLock, clearLock, retryLock, memid);
+    }
 
     // make sure that the memblock list is free of corruption before we crawl
@@ -915 +933 @@
     for (memBlock = topBlock; memBlock->nextBlock != NULL; memBlock = memBlock->nextBlock) { }
 
+    int maxToDisplay = maxDisplayedLeaksCount;
+    psMemBlock *memBlockBackup = memBlock;
+    if (maxToDisplay == -1 ) {
+      for (; memBlock != NULL; memBlock = memBlock->previousBlock) {
+        if ( (memBlock->refCounter > 0) &&
+             ( (persistence) || (!persistence && !memBlock->persistent) ) &&
+             (memBlock->id >= id0)) {
+          nleak++;
+        }
+      }
+      maxToDisplay=nleak;
+    }
+    if (fd != NULL) {
+      fprintf(fd, "Number of leaks to display: %d\n", maxToDisplay);
+    }
+    memBlock = memBlockBackup;
+
+    nleak=0;
     // iterate through the block list starting with the oldest block
     for (; memBlock != NULL; memBlock = memBlock->previousBlock) {
@@ -924 +960 @@
 
             // only print a max of 500 leaks (make this an argument)
-            if ((nleak < 500) && (fd != NULL)) {
+            if ( (nleak <= maxToDisplay) && (fd != NULL) ) {
                 if (nleak == 1) {
                     fprintf(fd, "# func at (file:line)  ID: X  Ref: X\n");

branches/eam_branches/ipp-20110710/psLib/src/sys/psMemory.h

@@ -367 +367 @@
     bool persistence                   ///< make check across all object even persistent ones
 );
+int psMemCheckLeaks2(
+    psMemId id0,                       ///< don't list blocks with id < id0
+    psMemBlock ***array,               ///< pointer to array of pointers to leaked blocks, or NULL
+    FILE * fd,                         ///< print list of leaks to fd (or NULL)
+    bool persistence,                  ///< make check across all object even persistent ones
+    int maxDisplayedLeaksCount         ///< List at most maxDisplayedLeaksCount (-1 for all)
+);
 #else // ifdef DOXYGEN
 int p_psMemCheckLeaks(
@@ -375 +382 @@
     psMemBlock ***array,                ///< pointer to array of pointers to leaked blocks, or NULL
     FILE * fd,                          ///< print list of leaks to fd (or NULL)
-    bool persistence                    ///< make check across all object even persistent ones
-);
-#ifndef SWIG
+    bool persistence,                   ///< make check across all object even persistent ones
+    int maxDisplayedLeaksCount          ///< List at most maxDisplayedLeaksCount (-1 for all)
+);
+#ifndef SWIG
+#define psMemCheckLeaks2(id0, array, fd, persistence, maxDisplayedLeaksCount) \
+      p_psMemCheckLeaks(__FILE__, __LINE__, __func__, id0, array, fd, persistence, maxDisplayedLeaksCount)
 #define psMemCheckLeaks(id0, array, fd, persistence) \
-      p_psMemCheckLeaks(__FILE__, __LINE__, __func__, id0, array, fd, persistence)
+      p_psMemCheckLeaks(__FILE__, __LINE__, __func__, id0, array, fd, persistence, 500)
 #endif // ifndef SWIG
 #endif // ifdef DOXYGEN

branches/eam_branches/ipp-20110710/psLib/src/types/psMetadataConfig.c

@@ -72 +72 @@
 static bool parseMetadataItem(char *keyName, psArray *levelArray,
                               char *linePtr, psMetadataFlags flags);
-static psString formatMetadataItem(psMetadataItem *item);
 static psArray *p_psMetadataKeyArray(psMetadata *md);
 static bool parseGeneric(char *keyName,
@@ -1337 +1336 @@
             return NULL;
         }
-        psString str = formatMetadataItem(item);
+        psString str = psMetadataItemFormat(item);
         if (!str) {
             psError(PS_ERR_UNKNOWN, false, "failed to format psMetadataItem");
@@ -1355 +1354 @@
 }
 
-
-static psString formatMetadataItem(psMetadataItem *item)
+// format a single metadata item for output (consistent with config dump I/O, includes return char)
+psString psMetadataItemFormat(psMetadataItem *item)
 {
     PS_ASSERT_METADATA_ITEM_NON_NULL(item, NULL);
@@ -1380 +1379 @@
             psMetadataItem *multiItem = NULL;
             while ((multiItem = psListGetAndIncrement(iter))) {
-                psString str = formatMetadataItem(multiItem);
+                psString str = psMetadataItemFormat(multiItem);
                 psStringAppend(&content, "%s", str);
                 psFree(str);
@@ -1597 +1596 @@
 }
 
-
 static psArray *p_psMetadataKeyArray(psMetadata *md)
 {

branches/eam_branches/ipp-20110710/psLib/src/types/psMetadataConfig.h

@@ -79 +79 @@
 );
 
+/** format metadata item.
+ *
+ *  Metadata Item is formatted to a string consistent with the MDC file formats
+ *
+ *  @return char:           allocated formatted string
+*/
+psString psMetadataItemFormat(psMetadataItem *item);
+
 /** Converts a psMetadata structure (including any nested psMetadata) into a
  *  configuration file formatted string that is written out to filename.