Changeset 19015

Timestamp:

Aug 11, 2008, 5:08:41 PM (18 years ago)

Author:

Paul Price

Message:

Adding functions to control threading of psImageConvolve functions.

File:

• trunk/psLib/src/imageops/psImageConvolve.c (modified) (7 diffs)

trunk/psLib/src/imageops/psImageConvolve.c

@@ -7 +7 @@
 /// @author Eugene Magnier, IfA
 ///
-/// @version $Revision: 1.72 $ $Name: not supported by cvs2svn $
-/// @date $Date: 2008-08-08 18:07:30 $
+/// @version $Revision: 1.73 $ $Name: not supported by cvs2svn $
+/// @date $Date: 2008-08-12 03:08:41 $
 ///
 /// Copyright 2004-2007 Institute for Astronomy, University of Hawaii
@@ -33 +33 @@
 
 #include "psImageConvolve.h"
+
+static bool threaded = false;           // Run image convolution threaded?
+
+
+
 
 static void kernelFree(psKernel *kernel)
@@ -865 +870 @@
 }
 
-
 psImage *psImageConvolveMask(psImage *out, const psImage *mask, psMaskType maskVal,
                              psMaskType setVal, int xMin, int xMax, int yMin, int yMax)
@@ -899 +903 @@
     }
 
-    static bool threadsInit = false;    // Threads initialised?
-    int numThreads = psThreadPoolSize();// Number of threads
-    if (numThreads > 0 && !threadsInit) {
-        psThreadTask *task = psThreadTaskAlloc("PSLIB_IMAGE_CONVOLVE_MASK", 8);
-        task->function = &imageConvolveMaskThread;
-        psThreadTaskAdd(task);
-        psFree(task);
-        threadsInit = true;
-    }
-
     int numRows = mask->numRows;        // Number of rows
     int numCols = mask->numCols;        // Number of columns
@@ -925 +919 @@
 
     // Rows
-    if (numThreads > 0) {
+    if (threaded) {
+        int numThreads = psThreadPoolSize(); // Number of threads
         float cols = (float)numCols / (float)numThreads; // Number of cols to do at once
         for (int i = 0; i < numThreads; i++) {
@@ -963 +958 @@
 
     // Columns
-    if (numThreads > 0) {
+    if (threaded) {
+        int numThreads = psThreadPoolSize(); // Number of threads
         float cols = (float)numCols / (float)numThreads; // Number of columns to do at once
         for (int i = 0; i < numThreads; i++) {
@@ -1064 +1060 @@
 }
 
+
+void psImageConvolveSetThreads(bool set)
+{
+    if (set && !threaded) {
+        {
+            psThreadTask *task = psThreadTaskAlloc("PSLIB_IMAGE_CONVOLVE_MASK", 8);
+            task->function = &imageConvolveMaskThread;
+            psThreadTaskAdd(task);
+            psFree(task);
+        }
+    } else if (!set && threaded) {
+        psThreadTaskDelete("PSLIB_IMAGE_CONVOLVE_MASK");
+    }
+
+    threaded = set;
+
+}
+
+bool psImageConvolveGetThreads(void)
+{
+    return threaded;
+}
+