Changeset 39319 for trunk/Ohana/src/libdvo

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/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/HostTable.c (modified) (4 diffs)

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