Changeset 21347 for trunk/psLib/src/mathtypes

Timestamp:

Feb 5, 2009, 3:05:58 PM (18 years ago)

Author:

eugene

Message:

added mutexes to protect the psImage children management

File:

• trunk/psLib/src/mathtypes/psImage.c (modified) (6 diffs)

trunk/psLib/src/mathtypes/psImage.c

@@ -9 +9 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.132 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-11-05 11:12:39 $
+ *  @version $Revision: 1.133 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 01:05:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
 #include <math.h>
 #include <unistd.h>
+#include <errno.h>
 
 #include "psMemory.h"
@@ -29 +30 @@
 #include "psAssert.h"
 #include "psAbort.h"
+#include "psTrace.h"
 
 #include "psImage.h"
@@ -53 +55 @@
 
         // drop my entry on my parent's array of children
+        // lock parent before freeing child : psArrayRemoveDataNoFree is NOT thread safe
+        psMutexLock (parent);
         psArrayRemoveDataNoFree (parent->children, image);
+        psMutexUnlock (parent);
 
         // drop my reference to my parent
@@ -66 +71 @@
     }
 
+    psMutexDestroy(image);
     psFree(image->children);
     psFree(image->p_rawDataBuffer);
@@ -122 +128 @@
     image->parent = NULL;
     image->children = NULL;
+
+    // XXX for now, we will add a mutex to all images.  in the future, allow images to be
+    // threaded or unthreaded independently?
+    psMutexInit (image);
 
     return image;