Changeset 35524

Timestamp:

May 7, 2013, 8:43:26 AM (13 years ago)

Author:

eugene

Message:

fix md collisions / double free

File:

• branches/eam_branches/ipp-20130419/pswarp/src/pswarpUpdateStatistics.c (modified) (5 diffs)

branches/eam_branches/ipp-20130419/pswarp/src/pswarpUpdateStatistics.c

@@ -42 +42 @@
         const char *chipName = psMetadataLookupStr(NULL, chip->concepts, "CHIP.NAME");
 
-        psMetadata *chipStats = psMetadataAlloc ();
-        psMetadataAdd (fpaStats, PS_LIST_TAIL, chipName, PS_DATA_METADATA, "chip stats folder", chipStats);
+        psMetadata *chipStats = psMetadataLookupPtr (&status, fpaStats, chipName);
+        if (!chipStats) {
+          chipStats = psMetadataAlloc ();
+          psMetadataAdd (fpaStats, PS_LIST_TAIL, chipName, PS_DATA_METADATA, "chip stats folder", chipStats);
+          psFree (chipStats);
+        }
 
         pmCell *cell;
@@ -53 +57 @@
             const char *cellName = psMetadataLookupStr(NULL, cell->concepts, "CELL.NAME");
 
-            psMetadata *cellStats = psMetadataAlloc ();
-            psMetadataAdd (chipStats, PS_LIST_TAIL, cellName, PS_DATA_METADATA, "cell stats folder", cellStats);
+            psMetadata *cellStats = psMetadataLookupPtr (&status, chipStats, cellName);
+            if (!cellStats) {
+              cellStats = psMetadataAlloc ();
+              psMetadataAdd (chipStats, PS_LIST_TAIL, cellName, PS_DATA_METADATA, "cell stats folder", cellStats);
+              psFree (cellStats);
+            }
 
             // process each of the readouts
@@ -68 +76 @@
                 psStringAppend (&readoutName, "READOUT.%02d", view->readout);
 
-                psMetadata *readoutStats = psMetadataAlloc ();
-                psMetadataAdd (cellStats, PS_LIST_TAIL, readoutName, PS_DATA_METADATA, "readout stats folder", readoutStats);
+                psMetadata *readoutStats = psMetadataLookupPtr (&status, cellStats, readoutName);
+                if (!readoutStats) {
+                  readoutStats = psMetadataAlloc ();
+                  psMetadataAdd (cellStats, PS_LIST_TAIL, readoutName, PS_DATA_METADATA, "readout stats folder", readoutStats);
+                  psFree (readoutStats);
+                }
 
                 if (!pswarpPixelsLit(readout, readoutStats, config)) {
@@ -118 +130 @@
                   psFree(headerName);
                 }
-                psFree (readoutStats);
                 psFree (readoutName);
             }
@@ -133 +144 @@
             trimsec->x0 = trimsec->x1 = trimsec->y0 = trimsec->y1 = 0; ///< All pixels
 
-            psFree (cellStats);
         }
-        psFree (chipStats);
     }