Changeset 33600 for branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c

Timestamp:

Mar 23, 2012, 2:19:56 PM (14 years ago)

Author:

eugene

Message:

improve verbosity; clear some memory leaks in parallel ops

File:

• branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c (modified) (2 diffs)

branches/eam_branches/ipp-20111122/Ohana/src/opihi/lib.shell/VectorOps.c

@@ -122 +122 @@
   /* is an old vector */
   if (mode == NEWVECTOR) goto error;
+  if (vectors[i]) {
+    if (vectors[i][0].elements.Ptr) free (vectors[i][0].elements.Ptr);
+    free (vectors[i]);
+  }
   vectors[i] = vec;
   return TRUE;
@@ -351 +355 @@
   }
 
-  myAssert (*Nvec == Ninvec, "programming error (1)");
+  myAssert (*Nvec == Ninvec, "programming error (1) %d vs %d", *Nvec, Ninvec);
 
   for (i = 0; i < Ninvec; i++) {
-    myAssert (!strcmp(vec[i]->name, invec[i]->name), "programming error (2)");
-    myAssert (vec[i]->type == invec[i]->type, "programming error (2)");
+    myAssert (!strcmp(vec[i]->name, invec[i]->name), "programming error (2) %s vs %s", vec[i]->name, invec[i]->name);
+    myAssert (vec[i]->type == invec[i]->type, "programming error (3), %d vs %d", vec[i]->type, invec[i]->type);
 
     int N = vec[i]->Nelements;