Changeset 21347

Timestamp:

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

Author:

eugene

Message:

added mutexes to protect the psImage children management

Location:

trunk/psLib/src

Files:

• imageops/psImageStructManip.c (modified) (7 diffs)
• mathtypes/psImage.c (modified) (6 diffs)

trunk/psLib/src/imageops/psImageStructManip.c

@@ -8 +8 @@
  *  @author Robert DeSonia, MHPCC
  *
- *  @version $Revision: 1.20 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2007-11-08 01:09:48 $
+ *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-06 01:05:58 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -21 +21 @@
 #include <string.h>
 #include <assert.h>
+#include <errno.h>
 
 #include "psMemory.h"
 #include "psError.h"
 #include "psAbort.h"
+#include "psTrace.h"
 
 #include "psImageStructManip.h"
@@ -108 +110 @@
 
             // drop my entry on my parent's array of children
+            psMutexLock (out);
             psArrayRemoveDataNoFree (out->parent->children, out);
+            psMutexUnlock (out);
 
             // drop my reference to my old parent
@@ -119 +123 @@
         out = p_psAlloc(file, lineno, func, sizeof(psImage));
         out->data.V = NULL;
+        psMutexInit (out);
     }
 
@@ -129 +134 @@
     P_PSIMAGE_SET_ROW0(out, row0);
 
+    // As long as I have a valid image reference, no one else can free it to zero (I have at
+    // least the last reference)
     out->parent = psMemIncrRefCounter(image); // track references to parents
     out->children = NULL;
@@ -144 +151 @@
     }
 
-    // add output image as a child of the input image.
+    // Add output image as a child of the input image.  Lock image before performing this
+    // operation (psArrayAdd is NOT thread-safe)
+    psMutexLock (image);
     image->children = p_psArrayAdd(file, lineno, func, image->children, 16, out);
+    psMutexUnlock (image);
+
     psFree (out); // the image->children array is an array of views only
-
     return (out);
 }
@@ -369 +379 @@
     P_PSIMAGE_SET_NUMROWS(image, numRows);
 
-    // XXX: should I really resize the buffers?
+    // resize the buffers to the new image size
     image->data.V = psRealloc(image->data.V,sizeof(psPtr)*numRows);
     image->p_rawDataBuffer = psRealloc(image->p_rawDataBuffer,rowSize*numRows);

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;