Changeset 19060

Timestamp:

Aug 13, 2008, 5:26:54 PM (18 years ago)

Author:

Paul Price

Message:

Changed API for pmSubtractionThreadsInit, and adding pmSubtractionThreadsFinalize. This takes care of mutexes for the images.

Location:

trunk/ppSub/src

Files:

• ppSubArguments.c (modified) (1 diff)
• ppSubReadout.c (modified) (2 diffs)

trunk/ppSub/src/ppSubArguments.c

@@ -255 +255 @@
     }
 
-    int threads = psMetadataLookupS32(NULL, arguments, "-threads"); // Number of threads
-    if (threads > 0) {
-        if (!psThreadPoolInit(threads)) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to setup %d threads", threads);
-            return false;
-        }
-        pmSubtractionThreadSetup();
-    }
-
     return true;
 }

trunk/ppSub/src/ppSubReadout.c

@@ -57 +57 @@
     psImage *reference = refRO->image;  // Reference image
     PS_ASSERT_IMAGES_SIZE_EQUAL(input, reference, false);
+
+    int threads = psMetadataLookupS32(NULL, config->arguments, "-threads"); // Number of threads
+    if (threads > 0) {
+        if (!psThreadPoolInit(threads)) {
+            psError(PS_ERR_UNKNOWN, false, "Unable to setup %d threads", threads);
+            return false;
+        }
+        pmSubtractionThreadsInit(inConv, refConv, inRO, refRO);
+    }
 
     // Look up recipe values
@@ -156 +165 @@
     psFree(optWidths);
 
+    pmSubtractionThreadsFinalize(inConv, refConv, inRO, refRO);
+
     // Add kernel descrption to header
     pmSubtractionKernels *kernels = psMetadataLookupPtr(&mdok, inConv->analysis,