Changeset 18822 for branches/eam_branch_20080719/pswarp/src/pswarpTransformReadout.c

Timestamp:

Jul 31, 2008, 1:24:22 PM (18 years ago)

Author:

eugene

Message:

some threading simplifications: threaded and unthreaded use the same code; added concept of a thread task

File:

• branches/eam_branch_20080719/pswarp/src/pswarpTransformReadout.c (modified) (2 diffs)

branches/eam_branch_20080719/pswarp/src/pswarpTransformReadout.c

@@ -71 +71 @@
             args->goodPixels = 0;
 
-            if (nThreads) {
-                // allocate a job
-                psThreadJob *job = psThreadJobAlloc ("PSWARP_TRANSFORM_TILE", 0);
+            // allocate a job
+            psThreadJob *job = psThreadJobAlloc ("PSWARP_TRANSFORM_TILE");
 
-                // construct the arguments for this job
-                // job is pswarpTransformTile (gridX, gridY);
-                psArrayAdd (job->args, 1, args);
-                // fprintf (stderr, "adding job %d,%d, Nargs: %ld\n", gridX, gridY, job->args->n);
-                psThreadJobAddPending (job);
-            } else {
-                pswarpTransformTile (args);
-                goodPixels += args->goodPixels;
+            // construct the arguments for this job
+            // job is pswarpTransformTile (gridX, gridY);
+            psArrayAdd (job->args, 1, args);
+            // fprintf (stderr, "adding job %d,%d, Nargs: %ld\n", gridX, gridY, job->args->n);
+
+            // call: pswarpTransformTile (args);
+            if (!psThreadJobAddPending (job)) {
+                psError(PS_ERR_UNKNOWN, false, "Unable to warp image.");
+                return false;
             }
             psFree (args);
@@ -89 +89 @@
 
     // wait for the threads to finish and manage results
-    if (nThreads) {
-        // wait here for the threaded jobs to finish
-        if (!psThreadPoolWait ()) {
-            psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
-            return false;
+    // wait here for the threaded jobs to finish
+    if (!psThreadPoolWait ()) {
+        psError(PS_ERR_UNKNOWN, false, "Unable to interpolate image.");
+        return false;
+    }
+    fprintf (stderr, "success for threaded jobs\n");
+
+    // each job records its own goodPixel values; sum them here
+    // we have only supplied one type of job, so we can assume the types here
+    psThreadJob *job = NULL;
+    while ((job = psThreadJobGetDone()) != NULL) {
+        if (job->args->n < 1) {
+            fprintf (stderr, "error with job\n");
+        } else {
+            pswarpTransformTileArgs *args = job->args->data[0];
+            // fprintf (stderr, "finished job %d,%d, Nargs: %ld\n", args->gridX, args->gridY, job->args->n);
+            goodPixels += args->goodPixels;
         }
-        fprintf (stderr, "success for threaded jobs\n");
-
-        // each job records its own goodPixel values; sum them here
-        // we have only supplied one type of job, so we can assume the types here
-        psThreadJob *job = NULL;
-        while ((job = psThreadJobGetDone()) != NULL) {
-            if (job->args->n < 1) {
-                fprintf (stderr, "error with job\n");
-            } else {
-                pswarpTransformTileArgs *args = job->args->data[0];
-                // fprintf (stderr, "finished job %d,%d, Nargs: %ld\n", args->gridX, args->gridY, job->args->n);
-                goodPixels += args->goodPixels;
-            }
-            psFree (job);
-        }
+        psFree (job);
     }
     psFree(interp);