Changeset 20832

Timestamp:

Nov 25, 2008, 3:03:46 PM (17 years ago)

Author:

Paul Price

Message:

Turn psImageConvolveMask threads on/off as required, and set back when done.

Location:

trunk/psModules/src/imcombine

Files:

• pmStackReject.c (modified) (2 diffs)
• pmSubtraction.c (modified) (2 diffs)
• pmSubtractionMask.c (modified) (2 diffs)

trunk/psModules/src/imcombine/pmStackReject.c

@@ -258 +258 @@
     }
 #endif
+
+    // Need to set psImageConvolveMask threading OFF because that would generate threads on top of threads
+    bool oldThreads = psImageConvolveSetThreads(false); // Old value of threading for psImageColvolve
 
     psImage *target = psImageRecycle(convolved, numCols, numRows, PS_TYPE_MASK); // Grown image
@@ -330 +333 @@
     }
 
+    psImageConvolveSetThreads(oldThreads);
+
 #ifdef TESTING
     {

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -1238 +1238 @@
     // and everything is executing psThreadPoolWait, waiting for some other mythical thread to complete the
     // thread's work.
-    psImageConvolveSetThreads(false);
+    bool oldThreads = psImageConvolveSetThreads(false); // Old value of threading for psImageConvolve
 
     if (stride == 0) {
@@ -1333 +1333 @@
     }
 
+    psImageConvolveSetThreads(oldThreads);
+
     psFree(sys1);
     psFree(sys2);

trunk/psModules/src/imcombine/pmSubtractionMask.c

@@ -137 +137 @@
     // footprint's distance of those (within 'footprint').
 
+    bool oldThreads = psImageConvolveSetThreads(true); // Old value of threading for psImageConvolve
+
     if (!psImageConvolveMask(mask, mask, PM_SUBTRACTION_MASK_BAD_1,
                              PM_SUBTRACTION_MASK_CONVOLVE_1,
@@ -151 +153 @@
         return NULL;
     }
+
+    psImageConvolveSetThreads(oldThreads);
 
     return mask;