Changeset 426 for trunk/matml

Timestamp:

02/23/2009 07:38:26 PM (3 years ago)

Author:

powell

Message:

Lock for qhull structures and memory, for future thread safety.

Files:

• trunk/matml/src/ternary/qhull.c (modified) (5 diffs)

trunk/matml/src/ternary/qhull.c

@@ -12 +12 @@
 #include <stdlib.h>
 #include <math.h>
+
+
+static int qhull_lock=0; /*+ Lock for qhull memory and structures +*/
 
 
@@ -125 +128 @@
     { printf ("qhullCalcHull: could not allocate memory for points\n");
       return -1; }
+
+  if (qhull_lock)
+    { printf ("Qhull use is currently locked\n"); return 1; }
+  qhull_lock=1;
+
   for (i=0; i<numpoints; i++)
     {
@@ -180 +188 @@
 #endif
   if (!(*facets = realloc (*facets, *numfacets * sizeof (hull_facet))))
-    { printf ("hullReturnFacets: could not reallocate memory for vertices\n");
-      return -1; }
+    {
+      printf ("hullReturnFacets: could not reallocate memory for vertices\n");
+      free (qpoints);
+      qh_freeqhull (True);
+      qhull_lock=0;
+      return -1;
+    }
 #ifdef DEBUG
   printf ("  post-realloc 0x%lx\n", *facets);
@@ -242 +255 @@
     }
 
+  free (qpoints);
+  qh_freeqhull (True);
+  qhull_lock=0;
+
 #ifdef DEBUG
   printf ("After trimming loop: %d total facets, i=%d\n", *numfacets, i);
@@ -252 +269 @@
   printf ("  post-realloc 0x%lx\n", *facets);
 #endif
-
-  free (qpoints);
-  qh_freeqhull (True);
 
   return 0;