Changeset 21438

Timestamp:

Feb 10, 2009, 11:33:02 AM (17 years ago)

Author:

bills

Message:

plug memory leaks

Location:

trunk/magic/remove/src

Files:

• streaksio.c (modified) (10 diffs)
• streaksio.h (modified) (2 diffs)
• warpedpixels.c (modified) (6 diffs)

trunk/magic/remove/src/streaksio.c

@@ -2 +2 @@
 #include "libgen.h"
 #include "unistd.h"
+
+static void sFileFree(sFile *sfile);
+static void streakFilesFree(streakFiles *sf);
+static void freeImages(streakFiles *);
 
 static nebServer *ourNebServer = NULL;
@@ -12 +16 @@
     bool status;
     streakFiles *sf = psAlloc(sizeof(streakFiles));
+    psMemSetDeallocator(sf, (psFreeFunc) streakFilesFree);
     memset(sf, 0, sizeof(*sf));
 
@@ -96 +101 @@
 }
 
-void sFileFree(sFile *sfile)
-{
-    psFree(sfile->resolved_name);
-    psFree(sfile->name);
-    psFree(sfile);
+static void
+streakFilesFree(streakFiles *sf)
+{
+    freeImages(sf);
+    psFree(sf->warpedPixels);
+    psFree(sf->tiles);
+    psFree(sf->view);
+    psFree(sf->astrom);
 }
 
@@ -232 +240 @@
     psString name = psMetadataLookupStr(&status, config->arguments, fileSelect);
     if (!status || !name) {
+        sFileFree(sfile);
         if (required) {
             psError(PS_ERR_IO, false, "Failed to lookup name for %s", fileSelect);
-            sFileFree(sfile);
             streaksExit("", 1);
         }
@@ -707 +715 @@
 
 void
+sFileFree(sFile *sfile)
+{
+    if (!sfile) {
+        return;
+    }
+    psFree(sfile->name);
+    psFree(sfile->resolved_name);
+    psFree(sfile);
+}
+
+void
 closeImage(sFile *sfile)
 {
@@ -718 +737 @@
     }
     psFree(sfile->header);
+    sfile->header = NULL;
     psFree(sfile->image);
+    sfile->header = NULL;
     psFree(sfile->imagecube);
-    psFree(sfile->name);
-    psFree(sfile->resolved_name);
-    psFree(sfile);
+    sfile->header = NULL;
 }
 
@@ -745 +764 @@
         closeImage(sf->outWeight);
         closeImage(sf->recWeight);
+    }
+}
+
+static void
+freeImages(streakFiles *sf)
+{
+    sFileFree(sf->inImage);
+    sFileFree(sf->outImage);
+    sFileFree(sf->recImage);
+    if (sf->inMask) {
+        sFileFree(sf->inMask);
+        sFileFree(sf->outMask);
+        sFileFree(sf->recMask);
+    }
+    if (sf->inChMask) {
+        sFileFree(sf->inChMask);
+        sFileFree(sf->outChMask);
+        sFileFree(sf->recChMask);
+    }
+    if (sf->inWeight) {
+        sFileFree(sf->inWeight);
+        sFileFree(sf->outWeight);
+        sFileFree(sf->recWeight);
     }
 }
@@ -845 +887 @@
     return true;
 }
-static bool
+
+bool
 swapOutputsToInputs(streakFiles *sfiles)
 {
-    if (sfiles->inMask) {
+    if (sfiles->outMask) {
         if (!swapOutputToInput(sfiles->inMask, sfiles->outMask)) {
             psError(PM_ERR_SYS, false, "failed to swap instances for Mask.");
@@ -855 +898 @@
     }
 
-    if (sfiles->inWeight) {
+    if (sfiles->outWeight) {
         if (!swapOutputToInput(sfiles->inWeight, sfiles->outWeight)) {
             psError(PM_ERR_SYS, false, "failed to swap instances for Weight.");
@@ -891 +934 @@
 }
 
-static bool
+bool
 deleteTemps(streakFiles *sfiles)
 {

trunk/magic/remove/src/streaksio.h

@@ -7 +7 @@
     psString outputFilename, bool required);
 
-void sFileFree(sFile *);
+void closeImages(streakFiles *sfiles);
 
-void closeImages(streakFiles *sfiles);
 void closeImage(sFile *sfile);
 
@@ -27 +26 @@
 bool isExciseValue(double, double);
 void setMaskedToNAN(streakFiles *sfiles, psU8 maskMask, bool printCounts);
+
+bool swapOutputsToInputs(streakFiles *sf);
 #endif // STREAKS_IO_H

trunk/magic/remove/src/warpedpixels.c

@@ -22 +22 @@
     int n = psArrayLength(skycells);
 
-    psRegion     bounds = *pmChipPixels(sf->chip);
+    psRegion     *bounds = pmChipPixels(sf->chip);
     
-    int width  = bounds.x1 - bounds.x0;
-    int height = bounds.y1 - bounds.y0;
+    int width  = bounds->x1 - bounds->x0;
+    int height = bounds->y1 - bounds->y0;
+
+    psFree(bounds);
 
     sf->warpedPixels = psImageAlloc(width, height, PS_TYPE_U8);
@@ -35 +37 @@
 
         addTouchedPixels(sf, resolved_name);
+        psFree(resolved_name);
     }
 
@@ -48 +51 @@
         psFitsWriteImage(fits, header, sf->warpedPixels, 0, NULL);
         psFitsClose(fits);
+        psFree(header);
     }
     return true;
@@ -62 +66 @@
     }
     psMetadata *header = psFitsReadHeader(NULL, fits);
+    psFitsClose(fits);
     if (!header) {
         psError(PS_ERR_IO, false, "failed to read fixts header from skycell file: %s", fileName);
@@ -75 +80 @@
     int naxis2 = psMetadataLookupS32(NULL, header, "NAXIS2");
 
+    psFree(header);
+
     /* now set up our wrapper to the chip astrometry to apply to the whole chip */
     sf->astrom = streakSetAstrometry(sf->astrom, sf->stage, sf->inAstrom->fpa, sf->chip, false, NULL, 
@@ -111 +118 @@
         pt[i].y = p.y;
     }
+
+    psFree(wcs);
 
     // put the corners in the desired order (see comments below)