Changeset 39330 for trunk

Timestamp:

Feb 4, 2016, 5:08:11 PM (10 years ago)

Author:

eugene

Message:

plug memleaks for loadstarpar; allow loadgalphot to skip cmfs without galaxies

Location:

trunk/Ohana/src/addstar

Files:

• include/loadstarpar.h (modified) (1 diff)
• src/find_matches_starpar.c (modified) (3 diffs)
• src/loadgalphot_readstars.c (modified) (1 diff)
• src/loadstarpar.c (modified) (1 diff)
• src/loadstarpar_client.c (modified) (1 diff)
• src/loadstarpar_io.c (modified) (2 diffs)
• src/loadstarpar_readstars.c (modified) (1 diff)
• src/loadstarpar_remote_hosts.c (modified) (2 diffs)
• src/loadstarpar_table.c (modified) (2 diffs)
• src/resort_unthreaded.c (modified) (2 diffs)

trunk/Ohana/src/addstar/include/loadstarpar.h

@@ -24 +24 @@
 
 int init_remote_hosts (void);
+void free_remote_hosts (void);
 int find_empty_slot (void);
 int harvest_all (void);

trunk/Ohana/src/addstar/src/find_matches_starpar.c

@@ -124 +124 @@
     N = N1[i];
 
-    /* make sure there is space for next entry */
+    /* make sure there is space for next entry (we add at most 1) */
     if (Nstarpar >= NSTARPAR) {
       NSTARPAR = Nstarpar + 1000;
@@ -200 +200 @@
   REALLOCATE (catalog[0].starpar, StarPar, Nstarpar);
  
-  resort_catalog_starpar (catalog);
-  catalog[0].sorted = TRUE;
-
   /* check if the catalog has changed?  if no change, no need to write */
   catalog[0].objID     = objID; // new max value, save on catalog close
@@ -208 +205 @@
   catalog[0].Nstarpar  = Nstarpar;
   catalog[0].Nsecfilt_mem = Nave*Nsecfilt;
+
+  resort_catalog_starpar (catalog);
+  catalog[0].sorted = TRUE;
+
   if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nstarpar: %d "OFF_T_FMT" "OFF_T_FMT" ("OFF_T_FMT" matches)\n",  Nstars, Nave, Nstarpar, Nmatch);
 

trunk/Ohana/src/addstar/src/loadgalphot_readstars.c

@@ -48 +48 @@
   }
   ftable_xfit.header = &header_xfit;
+
+  if (header_xfit.Naxis[1] == 0) {
+    if (VERBOSE) fprintf (stderr, "no data in file %s, skipping\n", filename);
+    gfits_free_header (&header_xfit);
+    gfits_free_header (&PHU);
+    fclose (f);
+    *nstars = 0;
+    return NULL;
+  }
 
   // in xgal, we have numerical values to specify the model types

trunk/Ohana/src/addstar/src/loadstarpar.c

@@ -55 +55 @@
     loadstarpar_table (skylist, hosts, argv[i], &options);
   }
+
+  FreeConfig ();
+  FreePhotcodeTable ();
+  SkyListFree (skylist);
+  SkyTableFree (sky);
+  FreeHostTable (hosts);
+
+  free_remote_hosts();
+
+  ohana_memcheck(TRUE);
+  ohana_memdump(TRUE);
   exit (0);
 }  

trunk/Ohana/src/addstar/src/loadstarpar_client.c

@@ -28 +28 @@
   free (stars);
 
+  FreeConfig ();
+  FreePhotcodeTable ();
+  SkyListFree (skylist);
+  SkyTableFree (sky);
+
+  free (CPT_FILE);
+  free (HOSTDIR);
+  free (INPUT);
+
+  ohana_memcheck(TRUE);
+  ohana_memdump(TRUE);
   exit (0);
 }

trunk/Ohana/src/addstar/src/loadstarpar_io.c

@@ -84 +84 @@
   gfits_free_table (&ftable);
 
+  free (ra      );
+  free (dec     );
+  free (glon    );
+  free (glat    );
+  free (Ebv     );
+  free (dEbv    );
+  free (DistMag );
+  free (dDistMag);
+  free (M_r     );
+  free (dM_r    );
+  free (FeH     );
+  free (dFeH    );
+  free (averef  );
+  free (objID   );
+  free (catID   );
+
   fflush (f);
   fclose (f);
@@ -180 +196 @@
   }
 
+  free (ra      );
+  free (dec     );
+  free (glon    );
+  free (glat    );
+  free (Ebv     );
+  free (dEbv    );
+  free (DistMag );
+  free (dDistMag);
+  free (M_r     );
+  free (dM_r    );
+  free (FeH     );
+  free (dFeH    );
+  free (averef  );
+  free (objID   );
+  free (catID   );
+
   fclose (f);
   *nstars = Nrow;

trunk/Ohana/src/addstar/src/loadstarpar_readstars.c

@@ -146 +146 @@
   gfits_free_matrix (&matrix);
 
+  free (glon);
+  free (glat);
+  free (conv);
+  free (lnZ);
+  free (DistMag);
+  free (Ebv);
+  free (M_r);
+  free (FeH);
+
+  free (transform);
+
   *nstars = Nstars;
   return (stars);

trunk/Ohana/src/addstar/src/loadstarpar_remote_hosts.c

@@ -14 +14 @@
 HostInfo **hosts = NULL;
 
-int init_remote_hosts () {
+int init_remote_hosts (void) {
 
   Nhosts = 10;
@@ -24 +24 @@
   }
   return TRUE;
+}
+
+void free_remote_hosts (void) {
+  if (!hosts) return;
+  free (hosts);
 }
 

trunk/Ohana/src/addstar/src/loadstarpar_table.c

@@ -7 +7 @@
 
   StarPar_Stars *stars = loadstarpar_readstars (filename, &Nstars);
+  if (!stars) return FALSE;
 
   // sort the stars by RA
@@ -37 +38 @@
     // is available.  In serial mode, just match against the appropriate region and save
     loadstarpar_save_remote (subset, Nsubset, hosts, region, skylist[0].filename[0], options);
+
+    free (subset);
+    SkyListFree (skylist);
   }
+  free (stars);
 
   // wait for last remote clients to finish

trunk/Ohana/src/addstar/src/resort_unthreaded.c

@@ -26 +26 @@
     catalog.catmode     = dvo_catalog_catmode (CATMODE);      // set the default catmode from config data
     catalog.catcompress = dvo_catalog_catcompress (CATCOMPRESS); // set the default catcompress from config data
-    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING;
+    catalog.catflags    = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_LENSING | DVO_LOAD_STARPAR | DVO_LOAD_GALPHOT;
     catalog.Nsecfilt    = GetPhotcodeNsecfilt ();
 
@@ -38 +38 @@
     if (catalog.Naverage_disk == 0) {
       dvo_catalog_unlock (&catalog);
+      dvo_catalog_free (&catalog);
+      continue;
+    }
+
+    if (!ForceSort && catalog.sorted) {
+      if (!dvo_catalog_unlock (&catalog)) { fprintf (stderr, "ERROR: failed to unlock %s\n", catalog.filename); exit (1); }
       dvo_catalog_free (&catalog);
       continue;