Changeset 6743 for branches/rel10_ifa/psModules/src/astrom/pmFPA.c

Timestamp:

Mar 30, 2006, 3:33:07 PM (20 years ago)

Author:

Paul Price

Message:

Plugging memory leaks --- done.

File:

• branches/rel10_ifa/psModules/src/astrom/pmFPA.c (modified) (3 diffs)

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

@@ -12 +12 @@
 * XXX: Should we implement non-linear cell->chip transforms?
 *
-*  @version $Revision: 1.1.4.5 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-03-28 02:16:26 $
+*  @version $Revision: 1.1.4.6 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-03-31 01:33:07 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
 static void readoutFree(pmReadout *readout)
 {
-    if (readout != NULL) {
-        psTrace(__func__, 9, "Removing readout %lx from cell %lx...\n", (size_t) readout, (size_t) readout->parent);
-        if (readout->parent) {
-            psArray *readouts = readout->parent->readouts;
-            for (int i = 0; i < readouts->n; i++) {
-                if (readouts->data[i] == readout) {
-                    //                    pmReadout *tmpReadout = readouts->data[i];
-                    readouts->data[i] = NULL;
-                    #if PARENT_LINKS
-
-                    psFree(tmpReadout);
-                    #endif
-
-                    break;
-                }
+    psTrace(__func__, 9, "Removing readout %lx from cell %lx...\n", (size_t) readout, (size_t) readout->parent);
+    if (readout->parent) {
+        psArray *readouts = readout->parent->readouts;
+        for (int i = 0; i < readouts->n; i++) {
+            if (readouts->data[i] == readout) {
+                //                    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
-
-        psFree(readout->image);
-        psFree(readout->mask);
-        psFree(readout->weight);
-        psFree(readout->analysis);
-        psFree(readout->bias);
-    }
+    }
+    psTrace(__func__, 9, "Freeing readout %lx\n", (size_t) readout);
+
+    #if PARENT_LINKS
+
+    psFree(readout->parent);
+    #endif
+
+    psFree(readout->image);
+    psFree(readout->mask);
+    psFree(readout->weight);
+    psFree(readout->analysis);
+    psFree(readout->bias);
 }
 
 static void cellFree(pmCell *cell)
 {
-    if (cell != NULL) {
-        psTrace(__func__, 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
-        if (cell->parent) {
-            psArray *cells = cell->parent->cells;
-            for (int i = 0; i < cells->n; i++) {
-                if (cells->data[i] == cell) {
-                    //                    pmCell *tmpCell = cells->data[i];
-                    cells->data[i] = NULL;
-                    #if PARENT_LINKS
-
-                    psFree(tmpCell);
-                    #endif
-
-                    break;
-                }
+    psTrace(__func__, 9, "Removing cell %lx from chip %lx...\n", (size_t)cell, (size_t)cell->parent);
+    if (cell->parent) {
+        psArray *cells = cell->parent->cells;
+        for (int i = 0; i < cells->n; i++) {
+            if (cells->data[i] == cell) {
+                //                    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
-
-        psFree(cell->concepts);
-        psFree(cell->analysis);
-        psFree(cell->config);
-        psFree(cell->hdu);
-    }
+    }
+    psTrace(__func__, 9, "Freeing cell %lx\n", (size_t)cell);
+
+    pmCellFreeReadouts(cell);
+    psFree(cell->readouts);
+    #if PARENT_LINKS
+
+    psFree(cell->parent);
+    #endif
+
+    psFree(cell->concepts);
+    psFree(cell->analysis);
+    psFree(cell->config);
+    psFree(cell->hdu);
 }
 
 static void chipFree(pmChip* chip)
 {
-    if (chip != NULL) {
-        psTrace(__func__, 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
-        if (chip->parent) {
-            psArray *chips = chip->parent->chips;
-            for (int i = 0; i < chips->n; i++) {
-                if (chips->data[i] == chip) {
-                    //                    pmChip *tmpChip = chips->data[i];
-                    chips->data[i] = NULL;
-                    #if PARENT_LINKS
-
-                    psFree(tmpChip);
-                    #endif
-
-                    break;
-                }
+    psTrace(__func__, 9, "Removing chip %lx from fpa %lx...\n", (size_t)chip, (size_t)chip->parent);
+    if (chip->parent) {
+        psArray *chips = chip->parent->chips;
+        for (int i = 0; i < chips->n; i++) {
+            if (chips->data[i] == chip) {
+                //                    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
-
-        #if 0
-
-        psFree(chip->toFPA);
-        psFree(chip->fromFPA);
-        #endif
-
-        psFree(chip->concepts);
-        psFree(chip->analysis);
-        psFree(chip->hdu);
-    }
+    }
+    psTrace(__func__, 9, "Freeing chip %lx\n", (size_t)chip);
+
+    pmChipFreeCells(chip);
+    psFree(chip->cells);
+    #if PARENT_LINKS
+
+    psFree(chip->parent);
+    #endif
+
+    #if 0
+
+    psFree(chip->toFPA);
+    psFree(chip->fromFPA);
+    #endif
+
+    psFree(chip->concepts);
+    psFree(chip->analysis);
+    psFree(chip->hdu);
 }
 
@@ -148 +142 @@
 static void FPAFree(pmFPA *fpa)
 {
-    if (fpa != NULL) {
-        psTrace(__func__, 9, "Freeing fpa %lx\n", (size_t)fpa);
-        #if 0
-
-        psFree(fpa->fromTangentPlane);
-        psFree(fpa->toTangentPlane);
-        psFree(fpa->projection);
-        #endif
-
-        psFree(fpa->concepts);
-        psFree(fpa->analysis);
-        psFree(fpa->camera);
-        //
-        // Set the parent to NULL in all fpa->chips before psFree(fpa->chips)
-        // in order to avoid memory reference counter problems.
-        //
-        psArray *chips = fpa->chips;
-        for (psS32 i = 0 ; i < chips->n ; i++) {
-            pmChip *tmpChip = chips->data[i];
-            if (! tmpChip) {
-                continue;
-            }
-            chips->data[i] = NULL;
-            tmpChip->parent = NULL;
-            if (PS_FREE_HIERARCHY == 1) {
-                psFree(tmpChip);
-            }
-        }
-        psFree(fpa->chips);
-        psFree(fpa->hdu);
-    }
+    psTrace(__func__, 9, "Freeing fpa %lx\n", (size_t)fpa);
+    #if 0
+
+    psFree(fpa->fromTangentPlane);
+    psFree(fpa->toTangentPlane);
+    psFree(fpa->projection);
+    #endif
+
+    psFree(fpa->concepts);
+    psFree(fpa->analysis);
+    psFree(fpa->camera);
+    //
+    // Set the parent to NULL in all fpa->chips before psFree(fpa->chips)
+    // in order to avoid memory reference counter problems.
+    //
+    psArray *chips = fpa->chips;
+    for (psS32 i = 0 ; i < chips->n ; i++) {
+        pmChip *tmpChip = chips->data[i];
+        if (! tmpChip) {
+            continue;
+        }
+        chips->data[i] = NULL;
+        tmpChip->parent = NULL;
+        if (PS_FREE_HIERARCHY == 1) {
+            psFree(tmpChip);
+        }
+    }
+    psFree(fpa->chips);
+    psFree(fpa->hdu);
 }