Changeset 39319

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

Files:

• dvomerge/src/IDmapIO.c (modified) (1 diff)
• dvomerge/src/dvomergeUpdate_catalogs.c (modified) (2 diffs)
• dvomerge/src/dvomerge_client.c (modified) (1 diff)
• libdvo/include/dvo.h (modified) (1 diff)
• libdvo/src/HostTable.c (modified) (4 diffs)

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);

trunk/Ohana/src/libdvo/include/dvo.h

@@ -1121 +1121 @@
 
 void InitHost (HostInfo *host);
+void FreeHostTable (HostTable *table);
+void FreeHostTableGroup (HostTableGroup *table);
 
 HostTableGroup *HostTableGroupsUniqueMachines (HostTable *table, int *ngroups);

trunk/Ohana/src/libdvo/src/HostTable.c

@@ -29 +29 @@
     free (hosts[i].hostname);
     free (hosts[i].pathname);
+    FreeIOBuffer (&hosts[i].stdout);
+    FreeIOBuffer (&hosts[i].stderr);
   }
   free (hosts);
@@ -34 +36 @@
 }
 
-void FreeTable (HostTable *table) {
+void FreeHostTable (HostTable *table) {
 
   if (!table) return;
@@ -46 +48 @@
 
 // a HostTableGroup is a pointer set to one or more HostTable entries
-void FreeTableGroup (HostTableGroup *table) {
+void FreeHostTableGroup (HostTableGroup *table) {
 
   if (!table) return;
@@ -264 +266 @@
     groups[i].Nhosts = 0;
     ALLOCATE (groups[i].hosts, HostInfo *, Nmax);
-    for (j = 0; j < Nmax; j++) {
+    for (j = 0; (j < Nmax) && (k < table->Nhosts); j++) {
       groups[i].hosts[groups[i].Nhosts] = &table->hosts[k];
       groups[i].Nhosts ++;