mirror of
https://github.com/Z3Prover/z3
synced 2025-10-09 09:21:56 +00:00
fixes
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
63b4503c15
commit
99e3089f9f
2 changed files with 2 additions and 7 deletions
|
@ -53,8 +53,7 @@ namespace smt {
|
||||||
void parallel2::worker::run() {
|
void parallel2::worker::run() {
|
||||||
search_tree::node<cube_config>* node = nullptr;
|
search_tree::node<cube_config>* node = nullptr;
|
||||||
expr_ref_vector cube(m);
|
expr_ref_vector cube(m);
|
||||||
while (m.inc()) {
|
while (true) {
|
||||||
|
|
||||||
collect_shared_clauses(m_g2l);
|
collect_shared_clauses(m_g2l);
|
||||||
|
|
||||||
if (!b.get_cube(m_g2l, id, cube, node)) {
|
if (!b.get_cube(m_g2l, id, cube, node)) {
|
||||||
|
@ -208,7 +207,6 @@ namespace smt {
|
||||||
m_search_tree.backtrack(node, g_core);
|
m_search_tree.backtrack(node, g_core);
|
||||||
if (m_search_tree.is_closed()) {
|
if (m_search_tree.is_closed()) {
|
||||||
m_state = state::is_unsat;
|
m_state = state::is_unsat;
|
||||||
cv.notify_all();
|
|
||||||
cancel_workers();
|
cancel_workers();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -315,7 +313,6 @@ namespace smt {
|
||||||
return;
|
return;
|
||||||
m_state = state::is_sat;
|
m_state = state::is_sat;
|
||||||
p.ctx.set_model(m.translate(l2g));
|
p.ctx.set_model(m.translate(l2g));
|
||||||
cv.notify_all();
|
|
||||||
cancel_workers();
|
cancel_workers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -332,7 +329,6 @@ namespace smt {
|
||||||
SASSERT(p.ctx.m_unsat_core.empty());
|
SASSERT(p.ctx.m_unsat_core.empty());
|
||||||
for (expr* e : unsat_core)
|
for (expr* e : unsat_core)
|
||||||
p.ctx.m_unsat_core.push_back(l2g(e));
|
p.ctx.m_unsat_core.push_back(l2g(e));
|
||||||
cv.notify_all();
|
|
||||||
cancel_workers();
|
cancel_workers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -343,7 +339,6 @@ namespace smt {
|
||||||
return;
|
return;
|
||||||
m_state = state::is_exception_code;
|
m_state = state::is_exception_code;
|
||||||
m_exception_code = error_code;
|
m_exception_code = error_code;
|
||||||
cv.notify_all();
|
|
||||||
cancel_workers();
|
cancel_workers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -354,7 +349,6 @@ namespace smt {
|
||||||
return;
|
return;
|
||||||
m_state = state::is_exception_msg;
|
m_state = state::is_exception_msg;
|
||||||
m_exception_msg = msg;
|
m_exception_msg = msg;
|
||||||
cv.notify_all();
|
|
||||||
cancel_workers();
|
cancel_workers();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -83,6 +83,7 @@ namespace smt {
|
||||||
IF_VERBOSE(1, verbose_stream() << "Canceling workers\n");
|
IF_VERBOSE(1, verbose_stream() << "Canceling workers\n");
|
||||||
for (auto& w : p.m_workers)
|
for (auto& w : p.m_workers)
|
||||||
w->cancel();
|
w->cancel();
|
||||||
|
cv.notify_all();
|
||||||
}
|
}
|
||||||
|
|
||||||
void init_parameters_state();
|
void init_parameters_state();
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue