Changeset 21351 for trunk/psModules/src/imcombine/pmSubtraction.c

Timestamp:

Feb 5, 2009, 3:09:38 PM (17 years ago)

Author:

eugene

Message:

comment out the mutex spins on the psImages (now handled by the psImage functions)

File:

• trunk/psModules/src/imcombine/pmSubtraction.c (modified) (8 diffs)

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -213 +213 @@
         return NULL;
     }
-    if (threaded) {
-        psMutexLock(image);
-    }
+    // XXX if (threaded) {
+    // XXX     psMutexLock(image);
+    // XXX }
     psImage *subset = psImageSubset(image, region); // Subset image, to return
-    if (threaded) {
-        psMutexUnlock(image);
-    }
+    // XXX if (threaded) {
+    // XXX     psMutexUnlock(image);
+    // XXX }
     return subset;
 }
@@ -232 +232 @@
         return;
     }
-    if (threaded) {
-        psMutexLock(parent);
-    }
+    // XXX if (threaded) {
+    // XXX     psMutexLock(parent);
+    // XXX }
     psFree(child);
-    if (threaded) {
-        psMutexUnlock(parent);
-    }
+    // XXX if (threaded) {
+    // XXX     psMutexUnlock(parent);
+    // XXX }
     return;
 }
@@ -1144 +1144 @@
         if (!out1->image) {
             out1->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-            if (threaded) {
-                psMutexInit(out1->image);
-            }
+            // XXX if (threaded) {
+            // XXX     psMutexInit(out1->image);
+            // XXX }
         }
         if (ro1->weight) {
             if (!out1->weight) {
                 out1->weight = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-                if (threaded) {
-                    psMutexInit(out1->weight);
-                }
+                // XXX if (threaded) {
+                // XXX     psMutexInit(out1->weight);
+                // XXX }
             }
             psImageInit(out1->weight, 0.0);
@@ -1161 +1161 @@
         if (!out2->image) {
             out2->image = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-            if (threaded) {
-                psMutexInit(out2->image);
-            }
+            // XXX if (threaded) {
+            // XXX     psMutexInit(out2->image);
+            // XXX }
         }
         if (ro2->weight) {
             if (!out2->weight) {
                 out2->weight = psImageAlloc(numCols, numRows, PS_TYPE_F32);
-                if (threaded) {
-                    psMutexInit(out2->weight);
-                }
+                // XXX if (threaded) {
+                // XXX     psMutexInit(out2->weight);
+                // XXX }
             }
             psImageInit(out2->weight, 0.0);
@@ -1177 +1177 @@
     psImage *convMask = NULL;           // Convolved mask image (common to inputs 1 and 2)
     if (subMask) {
-        if (threaded) {
-            psMutexInit(subMask);
-        }
+        // XXX if (threaded) {
+        // XXX     psMutexInit(subMask);
+        // XXX }
         if (kernels->mode == PM_SUBTRACTION_MODE_1 || kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
             if (!out1->mask) {
@@ -1205 +1205 @@
     if (kernels->mode == PM_SUBTRACTION_MODE_1 || kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
         sys1 = subtractionSysErrImage(ro1->image, sysError);
-        if (threaded && sys1) {
-            psMutexInit(sys1);
-        }
+        // XXX if (threaded && sys1) {
+        // XXX     psMutexInit(sys1);
+        // XXX }
     }
     if (kernels->mode == PM_SUBTRACTION_MODE_2 || kernels->mode == PM_SUBTRACTION_MODE_DUAL) {
         sys2 = subtractionSysErrImage(ro2->image, sysError);
-        if (threaded && sys2) {
-            psMutexInit(sys2);
-        }
+        // XXX if (threaded && sys2) {
+        // XXX     psMutexInit(sys2);
+        // XXX }
     }
 
@@ -1264 +1264 @@
                 psArrayAdd(args, 1, (pmReadout*)ro2); // Casting away const
                 // Since adding to the array can impact the reference count, we need to lock
-                if (sys1) {
-                    psMutexLock(sys1);
-                }
+                // XXX if (sys1) {
+                // XXX     psMutexLock(sys1);
+                // XXX }
                 psArrayAdd(args, 1, sys1);
-                if (sys1) {
-                    psMutexUnlock(sys1);
-                }
-                if (sys2) {
-                    psMutexLock(sys2);
-                }
+                // XXX if (sys1) {
+                // XXX     psMutexUnlock(sys1);
+                // XXX }
+                // XXX if (sys2) {
+                // XXX     psMutexLock(sys2);
+                // XXX }
                 psArrayAdd(args, 1, sys2);
-                if (sys2) {
-                    psMutexUnlock(sys2);
-                }
-                if (subMask) {
-                    psMutexLock(subMask);
-                }
+                // XXX if (sys2) {
+                // XXX     psMutexUnlock(sys2);
+                // XXX }
+                // XXX if (subMask) {
+                // XXX     psMutexLock(subMask);
+                // XXX }
                 psArrayAdd(args, 1, subMask);
-                if (subMask) {
-                    psMutexUnlock(subMask);
-                }
+                // XXX if (subMask) {
+                // XXX     psMutexUnlock(subMask);
+                // XXX }
                 PS_ARRAY_ADD_SCALAR(args, maskBad, PS_TYPE_IMAGE_MASK);
                 PS_ARRAY_ADD_SCALAR(args, maskPoor, PS_TYPE_IMAGE_MASK);
@@ -1324 +1324 @@
         }
 
-        if (subMask) {
-            psMutexDestroy(subMask);
-        }
-        if (sys1) {
-            psMutexDestroy(sys1);
-        }
-        if (sys2) {
-            psMutexDestroy(sys2);
-        }
+        // XXX if (subMask) {
+        // XXX     psMutexDestroy(subMask);
+        // XXX }
+        // XXX if (sys1) {
+        // XXX     psMutexDestroy(sys1);
+        // XXX }
+        // XXX if (sys2) {
+        // XXX     psMutexDestroy(sys2);
+        // XXX }
     }