Changeset 38497

Timestamp:

Jun 19, 2015, 9:03:41 AM (11 years ago)

Author:

eugene

Message:

free unused memory (incomplete)

Location:

branches/eam_branches/ipp-20150616/Ohana/src/dvomerge

Files:

• include/dvomerge.h (modified) (1 diff)
• src/dvo_image_merge_dbs.c (modified) (1 diff)
• src/dvomergeImageIDs.c (modified) (2 diffs)
• src/dvomergeUpdate.c (modified) (2 diffs)

branches/eam_branches/ipp-20150616/Ohana/src/dvomerge/include/dvomerge.h

@@ -174 +174 @@
 off_t      dvo_map_image_ID       PROTO((IDmapType *IDmap, off_t oldID));
 int        dvo_update_image_IDs   PROTO((IDmapType *IDmap, Catalog *catalog));
+void       dvo_image_map_free     PROTO((IDmapType *IDmap));
 
 // dvorepair prototypes

branches/eam_branches/ipp-20150616/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -5 +5 @@
 void SortTgtByTimes (e_time *S, off_t *I, short *C, off_t N);
 off_t getTgtIndex (e_time start, e_time stop, short photcode, off_t *TgtIndex, e_time *TgtTimes, short *TgtCodes, off_t NimagesTgt);
+
+void dvo_image_map_free (IDmapType *IDmap) {
+  // we don't own the IDmap, just the elements
+  free (IDmap->old);
+  free (IDmap->old);
+  free (IDmap->notFound);
+}
 
 // we have two tables; 'tgt' contains some exposures from 'src' : find them and match a map

branches/eam_branches/ipp-20150616/Ohana/src/dvomerge/src/dvomergeImageIDs.c

@@ -81 +81 @@
   dvo_image_unlock (&outDB); // unlock output
 
+  gfits_db_free (inDB);
+  gfits_db_free (outDB);
+
   return TRUE;
 }
@@ -136 +139 @@
   dvo_image_match_dbs(IDmap, &outDB, &inDB);
 
+  gfits_db_free (inDB);
+  gfits_db_free (outDB);
+
   return TRUE;
 }

branches/eam_branches/ipp-20150616/Ohana/src/dvomerge/src/dvomergeUpdate.c

@@ -112 +112 @@
 
   int status = dvomergeUpdate_catalogs (input, output, outsky, inlist, NsecfiltInput, NsecfiltOutput, &IDmap, secfiltMap);
+  dvo_image_map_free (&IDmap);
 
   // save the output sky table copy
@@ -121 +122 @@
   }
 
+  ohana_memcheck (TRUE);
+
   if (!status) {
     MARKTIME ("ERROR: elapsed time %9.4f sec\n", dtime);