Changeset 33089 for trunk/psModules

Timestamp:

Jan 11, 2012, 10:16:48 AM (14 years ago)

Author:

bills

Message:

Fix problems with IPP threading. In psThreadPoolWait wait until all threads have
finished before returning even if one of the threads has a fault.
Return false if any thread faults. Also add a new argument bool harvestOnFailure
which tells psThreadPoolWait to harvest the done jobs if there is a failure.
Many functions previously used psThreadPoolWait(harvest = false) because they
wanted to examine the jobs structs afterwards. However they weren't cleaning up the
jobs in the failure case.
These now call psThreadPoolWait(harvest = false, harvestOnFailure = true)
which causes the jobs to be cleaned up on fault. These lingering jobs were the
cause of the "Unknown task" failure in psImageConvolve*
Also changed psphotReadout to check for failure of psphotGuessModels and return
to the caller. This yields quality = 3007

Location:

trunk/psModules/src

Files:

• camera/pmReadoutFake.c (modified) (1 diff)
• detrend/pmBias.c (modified) (1 diff)
• detrend/pmDark.c (modified) (1 diff)
• detrend/pmFlatField.c (modified) (1 diff)
• detrend/pmShutterCorrection.c (modified) (1 diff)
• imcombine/pmStackReject.c (modified) (1 diff)
• imcombine/pmSubtraction.c (modified) (2 diffs)
• imcombine/pmSubtractionEquation.c (modified) (1 diff)
• imcombine/pmSubtractionEquation.v0.c (modified) (1 diff)
• imcombine/pmSubtractionMatch.c (modified) (1 diff)

trunk/psModules/src/camera/pmReadoutFake.c

@@ -314 +314 @@
                 }
             }
-            if (!psThreadPoolWait(true)) {
+            if (!psThreadPoolWait(true, true)) {
                 psError(PS_ERR_UNKNOWN, false, "Error waiting for threads.");
                 psFree(groups);

trunk/psModules/src/detrend/pmBias.c

@@ -154 +154 @@
     if (threaded) {
         // wait here for the threaded jobs to finish
-        if (!psThreadPoolWait(true)) {
+        if (!psThreadPoolWait(true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to apply bias correction.");
             return false;

trunk/psModules/src/detrend/pmDark.c

@@ -601 +601 @@
     if (threaded) {
         // wait here for the threaded jobs to finish
-        if (!psThreadPoolWait(true)) {
+        if (!psThreadPoolWait(true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to apply dark.");
             psFree(orders);

trunk/psModules/src/detrend/pmFlatField.c

@@ -161 +161 @@
     if (threaded) {
         // wait here for the threaded jobs to finish
-        if (!psThreadPoolWait(true)) {
+        if (!psThreadPoolWait(true, true)) {
             psError(PS_ERR_UNKNOWN, false, "Unable to flat-field image.");
             return false;

trunk/psModules/src/detrend/pmShutterCorrection.c

@@ -805 +805 @@
         if (threaded) {
             // wait here for the threaded jobs to finish
-            if (!psThreadPoolWait(true)) {
+            if (!psThreadPoolWait(true, true)) {
                 psError(PS_ERR_UNKNOWN, false, "Unable to apply shutter correction.");
                 psFree(shutterImage);

trunk/psModules/src/imcombine/pmStackReject.c

@@ -313 +313 @@
     }
 
-    if (!psThreadPoolWait(false)) {
+    if (!psThreadPoolWait(false, true)) {
         psError(psErrorCodeLast(), false, "Unable to grow bad pixels.");
         psFree(source);

trunk/psModules/src/imcombine/pmSubtraction.c

@@ -905 +905 @@
         }
     }
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;
@@ -1427 +1427 @@
     }
 
-    if (!psThreadPoolWait(false)) {
+    if (!psThreadPoolWait(false, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;

trunk/psModules/src/imcombine/pmSubtractionEquation.c

@@ -958 +958 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;

trunk/psModules/src/imcombine/pmSubtractionEquation.v0.c

@@ -882 +882 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         return false;

trunk/psModules/src/imcombine/pmSubtractionMatch.c

@@ -1091 +1091 @@
     }
 
-    if (!psThreadPoolWait(true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Error waiting for threads.");
         psFree(models);