Changeset 39319 for trunk/Ohana/src/dvomerge

Timestamp:

Jan 17, 2016, 3:00:30 PM (11 years ago)

Author:

eugene

Message:

fix the counting for ngroups, free allocated memory

Location:

trunk/Ohana/src/dvomerge/src

Files:

• IDmapIO.c (modified) (1 diff)
• dvomergeUpdate_catalogs.c (modified) (2 diffs)
• dvomerge_client.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/IDmapIO.c

@@ -135 +135 @@
   create_IDmap_lookup (IDmap);
 
+  gfits_free_header(&header);
+  gfits_free_matrix(&matrix);
+
+  gfits_free_header(&theader);
+  gfits_free_table (&ftable);
+
   return IDmap;
 }

trunk/Ohana/src/dvomerge/src/dvomergeUpdate_catalogs.c

@@ -277 +277 @@
     dvomergeUpdate_parallel_group (&groups[i], absinput, absoutput);
   }
+
+  for (i = 0; i < Ngroups; i++) {
+    free (groups[i].hosts);
+  }
+  free (groups);
+
+  FreeHostTable(table);
+
+  free (absinput);
+  free (absoutput);
   return TRUE;
 }
@@ -335 +345 @@
       group->hosts[i][0].pid = pid; // save for future reference
     }
+    free (command);
   }
 

trunk/Ohana/src/dvomerge/src/dvomerge_client.c

@@ -93 +93 @@
   dvomergeUpdate_catalogs (input, output, inlist, outsky, NsecfiltInput, NsecfiltOutput, IDmap, secfiltMap);
 
+  SkyTableFree (insky);
+  SkyTableFree (outsky);
+  SkyListFree (inlist);
+
+  if (IDmap) {
+    dvo_image_map_free (IDmap);
+    free (IDmap);
+  }
+  free (absoutput);
+  free (secfiltMap);
+  FreePhotcodeData (inputPhotcodes);
+  FreePhotcodeData (outputPhotcodes);
+
+  SetPhotcodeTable(NULL);
+  FreePhotcodeTable();
+
   dvomerge_client_args_free ();
   ohana_memcheck (TRUE);