Changeset 33415 for branches/meh_branches/ppstack_test/ppStack/src/ppStackCombineInitial.c

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• ppStack/src/ppStackCombineInitial.c (modified) (8 diffs)

branches/meh_branches/ppstack_test/ppStack/src/ppStackCombineInitial.c

@@ -2 +2 @@
 
 // This is the doomsday switch.
-// #define TESTING                         // Enable test output
+ #define TESTING                         // Enable test output
 
 bool ppStackCombineInitial(ppStackThreadData *stack, ppStackOptions *options, pmConfig *config)
@@ -17 +17 @@
 
     psTimerStart("PPSTACK_INITIAL");
+    //MEH
+    ppStackMemDump("initial:start");
 
     psMetadata *ppsub = psMetadataLookupMetadata(NULL, config->recipes, "PPSUB"); // PPSUB recipe
@@ -22 +24 @@
                                           "KERNEL.SIZE"); // Overlap by kernel size between consecutive scans
 
+    //MEH
+    ppStackMemDump("initial:configdone");
 
     bool status;                    // Status of read
@@ -27 +31 @@
     for (numChunk = 0; true; numChunk++) {
         ppStackThread *thread = ppStackThreadRead(&status, stack, config, numChunk, overlap);
+        //MEH -- full mem footprint before fault?
+        //ppStackMemDump("initial:threadread");
         if (!status) {
             // Something went wrong
@@ -36 +42 @@
             break;
         }
+        //MEH -- need to make so doesn't cause segfault - dump is bad - was full size though 150MB for sim20
+        //      ppStackMemDump("initial:threadchunkread");
 
         psThreadJob *job = psThreadJobAlloc("PPSTACK_INITIAL_COMBINE"); // Job to start
@@ -45 +53 @@
         }
     }
+    //MEH - also segfault
+    //    ppStackMemDump("initial:threadchunkdone");
 
-    if (!psThreadPoolWait(false)) {
+    if (!psThreadPoolWait(false, true)) {
         psError(psErrorCodeLast(), false, "Unable to do initial combination.");
         return false;
@@ -69 +79 @@
         psArray *inspect = results->data[0]; // Pixels to inspect
         psArray *reject = results->data[1];  // Pixels to reject
+        //MEH
+        //      ppStackMemDump("initial:threadchunkharvest");
+
         for (int i = 0; i < options->num; i++) {
             if (options->inputMask->data.PS_TYPE_VECTOR_MASK_DATA[i]) {
@@ -75 +88 @@
             options->inspect->data[i] = psArrayAdd(options->inspect->data[i], 1, inspect->data[i]);
             options->rejected->data[i] = psArrayAdd(options->rejected->data[i], 1, reject->data[i]);
+            //MEH
+            //      ppStackMemDump("initial:threadchunkinspect");
         }
         psFree(job);