Changeset 19059 for trunk/psModules/src/imcombine/pmSubtractionThreads.c

Timestamp:

Aug 13, 2008, 5:25:55 PM (18 years ago)

Author:

Paul Price

Message:

Adding threading for pmSubtractionConvolve. This was more difficult than for the others because the threads are working on a common image. Turns out that making child images using psImageSubset is not thread-safe: the image (which all threads are using) is modified. Wrapped those calls up in mutexes, and now threading seems to work fine.

File:

• trunk/psModules/src/imcombine/pmSubtractionThreads.c (modified) (3 diffs)

trunk/psModules/src/imcombine/pmSubtractionThreads.c

@@ -8 +8 @@
 #include "pmSubtractionMatch.h"
 #include "pmSubtractionEquation.h"
+#include "pmSubtraction.h"
 
 bool threaded = false;                  // Run with threads?
@@ -16 +17 @@
 }
 
-void pmSubtractionThreadSetup(void)
+// Initialise a mutex in each of the input
+static void subtractionMutexInit(pmReadout *ro)
+{
+    if (!ro) {
+        return;
+    }
+
+    if (ro->image) {
+        psMutexInit(ro->image);
+    }
+    if (ro->weight) {
+        psMutexInit(ro->weight);
+    }
+
+    return;
+}
+
+static void subtractionMutexDestroy(pmReadout *ro)
+{
+    if (!ro) {
+        return;
+    }
+
+    if (ro->image) {
+        psMutexDestroy(ro->image);
+    }
+    if (ro->weight) {
+        psMutexDestroy(ro->weight);
+    }
+
+    return;
+}
+
+void pmSubtractionThreadsInit(pmReadout *out1, pmReadout *out2, pmReadout *in1, pmReadout *in2)
 {
     if (threaded) {
-        psAbort("%s called multiple times.", __func__);
+        psAbort("Already running threaded.");
     }
 
     threaded = true;
+
+    subtractionMutexInit(out1);
+    subtractionMutexInit(out2);
+    subtractionMutexInit(in1);
+    subtractionMutexInit(in2);
 
     {
@@ -38 +77 @@
     }
 
+    {
+        psThreadTask *task = psThreadTaskAlloc("PSMODULES_SUBTRACTION_CONVOLVE", 17);
+        task->function = &pmSubtractionConvolveThread;
+        psThreadTaskAdd(task);
+        psFree(task);
+    }
+
     return;
 }
 
+
+void pmSubtractionThreadsFinalize(pmReadout *out1, pmReadout *out2, pmReadout *in1, pmReadout *in2)
+{
+    if (!threaded) {
+        return;
+    }
+
+    threaded = false;
+    psThreadTaskRemove("PSMODULES_SUBTRACTION_ORDER");
+    psThreadTaskRemove("PSMODULES_SUBTRACTION_CALCULATE_EQUATION");
+    psThreadTaskRemove("PSMODULES_SUBTRACTION_CONVOLVE");
+
+    subtractionMutexDestroy(out1);
+    subtractionMutexDestroy(out2);
+    subtractionMutexDestroy(in1);
+    subtractionMutexDestroy(in1);
+    return;
+}