chiark
/
gitweb
/
~ianmdlvl
/
matchsticks-search.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cbcccfb
)
in mc_iterate_worker, use maxhamweight_ok and preconsider_ok on incoming suggestions...
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 8 Mar 2014 19:42:25 +0000
(19:42 +0000)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sat, 8 Mar 2014 19:42:25 +0000
(19:42 +0000)
main.c
patch
|
blob
|
history
diff --git
a/main.c
b/main.c
index 8aaebad359679275a74ebd524460c6f67d0356f6..5eb9e19d6b0b7caa3324e9c515561b895639a14e 100644
(file)
--- a/
main.c
+++ b/
main.c
@@
-217,6
+217,13
@@
static void mc_iterate_worker(void) {
ssize_t r = readv(mc_work[0], mc_iov, mc_niovs);
if (r == 0) break;
assert(r == mc_iovlen);
+
+ bool ok = maxhamweight_ok();
+ if (!ok) continue;
+
+ ok = preconsider_ok(multicore_iteration_boundary, 1);
+ progress_eol();
+ if (!ok) continue;
/* stop iterate_recurse from trying to run multicore_outer_iteration */
int mc_org_it_bound = multicore_iteration_boundary;