mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-23 17:15:31 +00:00
Code Activity

ensure limit children are safe for race conditions

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-12-12 10:18:51 -08:00
parent f8a804ba56
commit 4132fc2d91
6 changed files with 51 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/util/rlimit.cpp
View file

@ -57,15 +57,47 @@ void reslimit::pop() {
m_cancel = false;
}
void reslimit::cancel() {
m_cancel = true;
for (unsigned i = 0; i < m_children.size(); ++i) {
m_children[i]->cancel();
char const* get_cancel_msg() const {
if (m_cancel) {
return Z3_CANCELED_MSG;
}
else {
return Z3_MAX_RESOURCE_MSG;
}
}
void reslimit::reset_cancel() {
m_cancel = false;
for (unsigned i = 0; i < m_children.size(); ++i) {
m_children[i]->reset_cancel();
void reslimit::push_child(reslimit* r) {
#pragma omp critical (reslimit_cancel)
{
m_children.push_back(r);
}
}
void reslimit::pop_child() {
#pragma omp critical (reslimit_cancel)
{
m_children.pop_back();
}
}
void reslimit::cancel() {
#pragma omp critical (reslimit_cancel)
{
set_cancel(false);
}
}
void reslimit::reset_cancel() {
#pragma omp critical (reslimit_cancel)
{
set_cancel(false);
}
}
void reslimit::set_cancel(bool f) {
m_cancel = f;
for (unsigned i = 0; i < m_children.size(); ++i) {
m_children[i]->set_cancel(f);
}
}

10
src/util/rlimit.h
View file

@ -27,19 +27,23 @@ class reslimit {
uint64 m_limit;
svector<uint64> m_limits;
ptr_vector<reslimit> m_children;
void set_cancel(bool f);
public:
reslimit();
void push(unsigned delta_limit);
void pop();
void push_child(reslimit* r) { m_children.push_back(r); }
void pop_child() { m_children.pop_back(); }
void push_child(reslimit* r);
void pop_child();
bool inc();
bool inc(unsigned offset);
uint64 count() const;
bool cancel_flag_set() { return m_cancel; }
bool get_cancel_flag() const { return m_cancel; }
char const* get_cancel_msg() const;
void cancel();
void reset_cancel();
};