mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-10-31 03:32:28 +00:00
Code Activity

cleanup deprecated critical sections, fix cancellation for par_or_else tactic

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-12 09:43:00 -08:00
parent c97db1722d
commit 2a051719d8
50 changed files with 105 additions and 276 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/sat/tactic/goal2sat.cpp
View file

@ -485,16 +485,10 @@ void goal2sat::collect_param_descrs(param_descrs & r) {
struct goal2sat::scoped_set_imp {
goal2sat * m_owner;
scoped_set_imp(goal2sat * o, goal2sat::imp * i):m_owner(o) {
#pragma omp critical (goal2sat)
{
m_owner->m_imp = i;
}
m_owner->m_imp = i;
}
~scoped_set_imp() {
#pragma omp critical (goal2sat)
{
m_owner->m_imp = 0;
}
m_owner->m_imp = 0;
}
};
@ -732,16 +726,10 @@ void sat2goal::collect_param_descrs(param_descrs & r) {
struct sat2goal::scoped_set_imp {
sat2goal * m_owner;
scoped_set_imp(sat2goal * o, sat2goal::imp * i):m_owner(o) {
#pragma omp critical (sat2goal)
{
m_owner->m_imp = i;
}
m_owner->m_imp = i;
}
~scoped_set_imp() {
#pragma omp critical (sat2goal)
{
m_owner->m_imp = 0;
}
m_owner->m_imp = 0;
}
};

10
src/sat/tactic/sat_tactic.cpp
View file

@ -145,17 +145,11 @@ class sat_tactic : public tactic {
sat_tactic * m_owner;
scoped_set_imp(sat_tactic * o, imp * i):m_owner(o) {
#pragma omp critical (sat_tactic)
{
m_owner->m_imp = i;
}
m_owner->m_imp = i;
}
~scoped_set_imp() {
#pragma omp critical (sat_tactic)
{
m_owner->m_imp = 0;
}
m_owner->m_imp = 0;
}
};