Changeset 6342 for branches/eam_rel9_p0/psModules/src/astrom/pmFPA.c

Timestamp:

Feb 7, 2006, 11:18:31 AM (20 years ago)

Author:

Paul Price

Message:

Squashing memory leaks

File:

• branches/eam_rel9_p0/psModules/src/astrom/pmFPA.c (modified) (14 diffs)

branches/eam_rel9_p0/psModules/src/astrom/pmFPA.c

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.1.2.6 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-01-31 20:09:52 $
+*  @version $Revision: 1.1.2.7 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-02-07 21:18:31 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -33 +33 @@
  *****************************************************************************/
 #define PS_FREE_HIERARCHY 1
+#define PARENT_LINKS 0
+
 static void readoutFree(pmReadout *readout)
 {
     if (readout != NULL) {
-        #if 0
         psTrace(__func__, 9, "Removing readout %lx from cell %lx...\n", (size_t) readout, (size_t) readout->parent);
         if (readout->parent) {
@@ -42 +43 @@
             for (int i = 0; i < readouts->n; i++) {
                 if (readouts->data[i] == readout) {
-                    pmReadout *tmpReadout = readouts->data[i];
+                    //                    pmReadout *tmpReadout = readouts->data[i];
                     readouts->data[i] = NULL;
+                    #if PARENT_LINKS
+
                     psFree(tmpReadout);
+                    #endif
+
                     break;
                 }
             }
         }
+        psTrace(__func__, 9, "Freeing readout %lx\n", (size_t) readout);
+
+        #if PARENT_LINKS
+
+        psFree(readout->parent);
         #endif
-        psTrace(__func__, 9, "Freeing readout %lx\n", (size_t) readout);
-
-        psFree(readout->parent);
 
         psFree(readout->image);
@@ -64 +71 @@
 {
     if (cell != NULL) {
-        #if 0
         psTrace(__func__, 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
         if (cell->parent) {
@@ -70 +76 @@
             for (int i = 0; i < cells->n; i++) {
                 if (cells->data[i] == cell) {
-                    pmCell *tmpCell = cells->data[i];
+                    //                    pmCell *tmpCell = cells->data[i];
                     cells->data[i] = NULL;
+                    #if PARENT_LINKS
+
                     psFree(tmpCell);
+                    #endif
+
                     break;
                 }
             }
         }
+        psTrace(__func__, 9, "Freeing cell %lx\n", (size_t)cell);
+
+        pmCellFreeReadouts(cell);
+        psFree(cell->readouts);
+        #if PARENT_LINKS
+
+        psFree(cell->parent);
         #endif
-        psTrace(__func__, 9, "Freeing cell %lx\n", (size_t)cell);
-
-        pmCellFreeReadouts(cell);
-        psFree(cell->parent);
 
         psFree(cell->toChip);
@@ -96 +109 @@
 {
     if (chip != NULL) {
-        #if 0
         psTrace(__func__, 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
         if (chip->parent) {
@@ -102 +114 @@
             for (int i = 0; i < chips->n; i++) {
                 if (chips->data[i] == chip) {
-                    pmChip *tmpChip = chips->data[i];
+                    //                    pmChip *tmpChip = chips->data[i];
                     chips->data[i] = NULL;
+                    #if PARENT_LINKS
+
                     psFree(tmpChip);
+                    #endif
+
                     break;
                 }
             }
         }
+        psTrace(__func__, 9, "Freeing chip %lx\n", (size_t)chip);
+
+        pmChipFreeCells(chip);
+        psFree(chip->cells);
+        #if PARENT_LINKS
+
+        psFree(chip->parent);
         #endif
-        psTrace(__func__, 9, "Freeing chip %lx\n", (size_t)chip);
-
-        pmChipFreeCells(chip);
-        psFree(chip->parent);
 
         psFree(chip->toFPA);
@@ -134 +153 @@
         psFree(fpa->analysis);
         psFree(fpa->camera);
-        #if 1
         //
         // Set the parent to NULL in all fpa->chips before psFree(fpa->chips)
@@ -148 +166 @@
             }
         }
-        #endif
+        psFree(fpa->chips);
         psFree(fpa->hdu);
         psFree(fpa->phu);
@@ -167 +185 @@
         psTrace(__func__, 9, "Will now free readout %lx...\n", (size_t)tmpReadout);
         psFree(tmpReadout); // Drop the readout
+        #if PARENT_LINKS
+
         psFree(cell); // Decrement reference counter on cell, since readout->parent isn't held any more
+        #endif
+
     }
     cell->readouts = psArrayRealloc(cell->readouts, 0);
+    cell->readouts->n = 0;
 }
 
@@ -186 +209 @@
         pmCellFreeReadouts(tmpCell);// Drop all readouts the cell holds
         psFree(tmpCell);            // Drop the cell
+        #if PARENT_LINKS
+
         psFree(chip); // Decrement reference counter on chip, since cell->parent isn't held any more
+        #endif
+
     }
     chip->cells = psArrayRealloc(chip->cells, 0);
+    chip->cells->n = 0;
 }
 
@@ -219 +247 @@
     tmpReadout->bias = psListAlloc(NULL);
     tmpReadout->analysis = psMetadataAlloc();
+    #if PARENT_LINKS
+
     tmpReadout->parent = psMemIncrRefCounter(cell);
+    #else
+
+    tmpReadout->parent = cell;
+    #endif
+
     if (cell != NULL) {
         cell->readouts = psArrayAdd(cell->readouts, 1, (psPtr) tmpReadout);
@@ -249 +284 @@
     tmpCell->analysis = psMetadataAlloc();
     tmpCell->readouts = psArrayAlloc(0);
+    #if PARENT_LINKS
+
     tmpCell->parent = psMemIncrRefCounter(chip);
+    #else
+
+    tmpCell->parent = chip;
+    #endif
+
     if (chip != NULL) {
         chip->cells = psArrayAdd(chip->cells, 1, (psPtr) tmpCell);
@@ -282 +324 @@
     tmpChip->analysis = psMetadataAlloc();
     tmpChip->cells = psArrayAlloc(0);
+    #if PARENT_LINKS
+
     tmpChip->parent = psMemIncrRefCounter(fpa);
+    #else
+
+    tmpChip->parent = fpa;
+    #endif
+
     if (fpa != NULL) {
         fpa->chips = psArrayAdd(fpa->chips, 1, (psPtr) tmpChip);