Changeset 41848 for branches/eam_branches/ppStack.20211015/src/ppStackCombinePercent.c

Timestamp:

Oct 17, 2021, 1:31:19 PM (5 years ago)

Author:

eugene

Message:

basic combine-by-percent is working (needs variance and mask fixes)

File:

• branches/eam_branches/ppStack.20211015/src/ppStackCombinePercent.c (modified) (2 diffs)

branches/eam_branches/ppStack.20211015/src/ppStackCombinePercent.c

@@ -1 +1 @@
 #include "ppStack.h"
+
+// #define TESTING
 
 bool ppStackCombinePercent(ppStackThreadData *stack, ppStackOptions *options, pmConfig *config)
@@ -32 +34 @@
     }
 
-    if (!psThreadPoolWait(false, true)) {
+    if (!psThreadPoolWait(true, true)) {
         psError(psErrorCodeLast(), false, "Unable to do initial combination.");
         return false;
-    }
-
-    psThreadJob *job;               // Completed job
-    while ((job = psThreadJobGetDone())) {
-        psAssert(strcmp(job->type, "PPSTACK_PERCENT_COMBINE") == 0,
-                 "Job has incorrect type: %s", job->type);
-        psFree(job);
     }