Changeset 28484 for branches/pap/psphot/src/psphotTest.c

Timestamp:

Jun 24, 2010, 2:59:09 PM (16 years ago)

Author:

Paul Price

Message:

Merging trunk in advance of reintegrating into trunk.

Location:

branches/pap

Files:

• . (modified) (1 prop)
• psphot (modified) (1 prop)
• psphot/src/psphotTest.c (modified) (5 diffs)

branches/pap/psphot/src/psphotTest.c

@@ -25 +25 @@
 
 bool FillImage_Threaded (psThreadJob *job) {
-    
+
     psImage *image = job->args->data[0];
     int xs = PS_SCALAR_VALUE(job->args->data[1],S32);
@@ -36 +36 @@
     psRegion region = psRegionSet (xs, xs + dx, ys, ys + dy);
     for (int i = 0; i < 100; i++) {
-        psImage *subset = psImageSubset (image, region);
-        psImageInit (subset, value + i);
-        psFree (subset);
+        psImage *subset = psImageSubset (image, region);
+        psImageInit (subset, value + i);
+        psFree (subset);
     }
     return true;
@@ -46 +46 @@
 
     if (argc != 3) {
-        fprintf (stderr, "USAGE: psphotTest (output.fits) (nThreads)\n");
-        exit (2);
+        fprintf (stderr, "USAGE: psphotTest (output.fits) (nThreads)\n");
+        exit (2);
     }
 
@@ -62 +62 @@
 
     for (int ix = 0; ix < 1000; ix += 100) {
-        for (int iy = 0; iy < 1000; iy += 100) {
+        for (int iy = 0; iy < 1000; iy += 100) {
 
-            // allocate a job -- if threads are not defined, this just runs the job
-            psThreadJob *job = psThreadJobAlloc ("FILL_IMAGE");
+            // allocate a job -- if threads are not defined, this just runs the job
+            psThreadJob *job = psThreadJobAlloc ("FILL_IMAGE");
 
-            psArrayAdd(job->args, 1, image);
-            PS_ARRAY_ADD_SCALAR(job->args, ix, PS_TYPE_S32);
-            PS_ARRAY_ADD_SCALAR(job->args, iy, PS_TYPE_S32);
-            PS_ARRAY_ADD_SCALAR(job->args, 100, PS_TYPE_S32);
-            PS_ARRAY_ADD_SCALAR(job->args, 100, PS_TYPE_S32);
-            PS_ARRAY_ADD_SCALAR(job->args, ix + iy, PS_TYPE_S32);
+            psArrayAdd(job->args, 1, image);
+            PS_ARRAY_ADD_SCALAR(job->args, ix, PS_TYPE_S32);
+            PS_ARRAY_ADD_SCALAR(job->args, iy, PS_TYPE_S32);
+            PS_ARRAY_ADD_SCALAR(job->args, 100, PS_TYPE_S32);
+            PS_ARRAY_ADD_SCALAR(job->args, 100, PS_TYPE_S32);
+            PS_ARRAY_ADD_SCALAR(job->args, ix + iy, PS_TYPE_S32);
 
-            // FillImage (image, ix, iy, 100, 100, ix + iy);
+            // FillImage (image, ix, iy, 100, 100, ix + iy);
 
-            if (!psThreadJobAddPending(job)) {
-                fprintf (stderr, "failure to run FillImage(1)");
-                psFree (job);
-                exit (1);
-            }
-            psFree(job);
-        }
+            if (!psThreadJobAddPending(job)) {
+                fprintf (stderr, "failure to run FillImage(1)");
+                exit (1);
+            }
+        }
     }
 
@@ -88 +86 @@
     // wait for the threads to finish and manage results
     if (!psThreadPoolWait (true)) {
-        fprintf (stderr, "failure to run FillImage (2)");
-        exit (1);
+        fprintf (stderr, "failure to run FillImage (2)");
+        exit (1);
     }